Backed out changeset 61442f7ad442 (bug 1264489) for breaking fennec nighlys
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 10 Jun 2016 16:35:05 +0200
changeset 301440 b6f7d0eb61b1878d3d906bd231edf225463ece3f
parent 301439 707190f2d20a50c3da8979dcc322bad6158c5d50
child 301470 0201cd2703b878af094e95de65087d1f606f4650
child 301593 87234bd3f341ac0dd7ec77852b3870cd18ebad44
push id30334
push usercbook@mozilla.com
push dateFri, 10 Jun 2016 14:35:21 +0000
treeherdermozilla-central@b6f7d0eb61b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1264489
milestone50.0a1
backs out61442f7ad442445cf5492949fb8771176e12cc50
first release with
nightly linux32
b6f7d0eb61b1 / 50.0a1 / 20160610073607 / files
nightly linux64
b6f7d0eb61b1 / 50.0a1 / 20160610073607 / files
nightly mac
b6f7d0eb61b1 / 50.0a1 / 20160610073607 / files
nightly win32
b6f7d0eb61b1 / 50.0a1 / 20160610073607 / files
nightly win64
b6f7d0eb61b1 / 50.0a1 / 20160610073607 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 61442f7ad442 (bug 1264489) for breaking fennec nighlys
mobile/android/base/java/org/mozilla/gecko/db/AbstractPerProfileDatabaseProvider.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/AbstractPerProfileDatabaseProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/AbstractPerProfileDatabaseProvider.java
@@ -1,17 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.db;
 
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.util.ThreadUtils;
 
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
 
 /**
  * The base class for ContentProviders that wish to use a different DB
  * for each profile.
@@ -32,20 +30,16 @@ public abstract class AbstractPerProfile
      * passed URI. If the URI does not contain a profile param, the default profile
      * is used.
      *
      * @param uri content URI optionally indicating the profile of the user
      * @return    instance of a readable SQLiteDatabase
      */
     @Override
     protected SQLiteDatabase getReadableDatabase(Uri uri) {
-        if (!AppConstants.MOZILLA_OFFICIAL) {
-            ThreadUtils.assertNotOnUiThread();
-        }
-
         String profile = null;
         if (uri != null) {
             profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);
         }
 
         return getDatabases().getDatabaseHelperForProfile(profile, isTest(uri)).getReadableDatabase();
     }
 
@@ -54,20 +48,16 @@ public abstract class AbstractPerProfile
      * passed URI. If the URI does not contain a profile param, the default profile
      * is used
      *
      * @param uri content URI optionally indicating the profile of the user
      * @return    instance of a writable SQLiteDatabase
      */
     @Override
     protected SQLiteDatabase getWritableDatabase(Uri uri) {
-        if (!AppConstants.MOZILLA_OFFICIAL) {
-            ThreadUtils.assertNotOnUiThread();
-        }
-
         String profile = null;
         if (uri != null) {
             profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);
         }
 
         return getDatabases().getDatabaseHelperForProfile(profile, isTest(uri)).getWritableDatabase();
     }