Cleanup USER_OWNER in SettingsProvider[Test]
Fixed up the tests and re-enabled it.
Still suppressed one test because what it relies on Settings.Bookmarks
is broken because Settings query format changed.
Fixed a bug in SettingsProvider that the package query is using the
wrong user id.
Bug: 19913735
Change-Id: Ied86a261defba2706f726a13bc32f385f7d93787
diff --git a/core/tests/coretests/src/android/provider/SettingsProviderTest.java b/core/tests/coretests/src/android/provider/SettingsProviderTest.java
index 2615a28..e6d3158 100644
--- a/core/tests/coretests/src/android/provider/SettingsProviderTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsProviderTest.java
@@ -28,7 +28,6 @@
import android.net.Uri;
import android.os.UserHandle;
import android.os.UserManager;
-import android.provider.Settings;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
@@ -37,7 +36,6 @@
import java.util.List;
/** Unit test for SettingsProvider. */
-@Suppress // Failing.
public class SettingsProviderTest extends AndroidTestCase {
@MediumTest
public void testNameValueCache() {
@@ -53,84 +51,108 @@
assertEquals(1, r.delete(Settings.Secure.getUriFor("test_service"), null, null));
assertEquals(null, Settings.Secure.getString(r, "test_service"));
- // Try all the same things in the System table
- Settings.System.putString(r, "test_setting", "Value");
- assertEquals("Value", Settings.System.getString(r, "test_setting"));
-
- Settings.System.putString(r, "test_setting", "New");
- assertEquals("New", Settings.System.getString(r, "test_setting"));
-
- assertEquals(1, r.delete(Settings.System.getUriFor("test_setting"), null, null));
- assertEquals(null, Settings.System.getString(r, "test_setting"));
+ // Apps should not be able to use System settings.
+ try {
+ Settings.System.putString(r, "test_setting", "Value");
+ fail("IllegalArgumentException expected");
+ } catch (java.lang.IllegalArgumentException e) {
+ // expected
+ }
}
@MediumTest
- public void testRowNameContentUri() {
+ public void testRowNameContentUriForSecure() {
+ final String testKey = "testRowNameContentUriForSecure";
+ final String testValue = "testValue";
+ final String secondTestValue = "testValueNew";
+
+ try {
+ testRowNameContentUri(Settings.Secure.CONTENT_URI, Settings.Secure.NAME,
+ Settings.Secure.VALUE, testKey, testValue, secondTestValue);
+ } finally {
+ // clean up
+ Settings.Secure.putString(getContext().getContentResolver(), testKey, null);
+ }
+ }
+
+ @MediumTest
+ public void testRowNameContentUriForSystem() {
+ final String testKey = Settings.System.VIBRATE_ON;
+ assertTrue("Settings.System.PUBLIC_SETTINGS cannot be empty. We need to use one of it"
+ + " for testing. Only settings key in this collection will be accepted by the"
+ + " framework.", Settings.System.PUBLIC_SETTINGS.contains(testKey));
+ final String testValue = "0";
+ final String secondTestValue = "1";
+ final String oldValue =
+ Settings.System.getString(getContext().getContentResolver(), testKey);
+
+ try {
+ testRowNameContentUri(Settings.System.CONTENT_URI, Settings.System.NAME,
+ Settings.System.VALUE, testKey, testValue, secondTestValue);
+ } finally {
+ // restore old value
+ if (oldValue != null) {
+ Settings.System.putString(getContext().getContentResolver(), testKey, oldValue);
+ }
+ }
+ }
+
+ private void testRowNameContentUri(Uri table, String nameField, String valueField,
+ String testKey, String testValue, String secondTestValue) {
ContentResolver r = getContext().getContentResolver();
- assertEquals("content://settings/system/test_setting",
- Settings.System.getUriFor("test_setting").toString());
- assertEquals("content://settings/secure/test_service",
- Settings.Secure.getUriFor("test_service").toString());
+ ContentValues v = new ContentValues();
+ v.put(nameField, testKey);
+ v.put(valueField, testValue);
- // These tables use the row name (not ID) as their content URI.
- Uri tables[] = { Settings.System.CONTENT_URI, Settings.Secure.CONTENT_URI };
- for (Uri table : tables) {
- ContentValues v = new ContentValues();
- v.put(Settings.System.NAME, "test_key");
- v.put(Settings.System.VALUE, "Test");
- Uri uri = r.insert(table, v);
- assertEquals(table.toString() + "/test_key", uri.toString());
+ r.insert(table, v);
+ Uri uri = Uri.parse(table.toString() + "/" + testKey);
- // Query with a specific URI and no WHERE clause succeeds.
- Cursor c = r.query(uri, null, null, null, null);
- try {
- assertTrue(c.moveToNext());
- assertEquals("test_key", c.getString(c.getColumnIndex(Settings.System.NAME)));
- assertEquals("Test", c.getString(c.getColumnIndex(Settings.System.VALUE)));
- assertFalse(c.moveToNext());
- } finally {
- c.close();
- }
-
- // Query with a specific URI and a WHERE clause fails.
- try {
- r.query(uri, null, "1", null, null);
- fail("UnsupportedOperationException expected");
- } catch (UnsupportedOperationException e) {
- if (!e.toString().contains("WHERE clause")) throw e;
- }
-
- // Query with a tablewide URI and a WHERE clause succeeds.
- c = r.query(table, null, "name='test_key'", null, null);
- try {
- assertTrue(c.moveToNext());
- assertEquals("test_key", c.getString(c.getColumnIndex(Settings.System.NAME)));
- assertEquals("Test", c.getString(c.getColumnIndex(Settings.System.VALUE)));
- assertFalse(c.moveToNext());
- } finally {
- c.close();
- }
-
- v = new ContentValues();
- v.put(Settings.System.VALUE, "Toast");
- assertEquals(1, r.update(uri, v, null, null));
-
- c = r.query(uri, null, null, null, null);
- try {
- assertTrue(c.moveToNext());
- assertEquals("test_key", c.getString(c.getColumnIndex(Settings.System.NAME)));
- assertEquals("Toast", c.getString(c.getColumnIndex(Settings.System.VALUE)));
- assertFalse(c.moveToNext());
- } finally {
- c.close();
- }
-
- assertEquals(1, r.delete(uri, null, null));
+ // Query with a specific URI and no WHERE clause succeeds.
+ Cursor c = r.query(uri, null, null, null, null);
+ try {
+ assertTrue(c.moveToNext());
+ assertEquals(testKey, c.getString(c.getColumnIndex(nameField)));
+ assertEquals(testValue, c.getString(c.getColumnIndex(valueField)));
+ assertFalse(c.moveToNext());
+ } finally {
+ c.close();
}
- assertEquals(null, Settings.System.getString(r, "test_key"));
- assertEquals(null, Settings.Secure.getString(r, "test_key"));
+ // Query with a specific URI and a WHERE clause fails.
+ try {
+ r.query(uri, null, "1", null, null);
+ fail("IllegalArgumentException expected");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ // Query with a tablewide URI and a WHERE clause succeeds.
+ c = r.query(table, null, "name='" + testKey + "'", null, null);
+ try {
+ assertTrue(c.moveToNext());
+ assertEquals(testKey, c.getString(c.getColumnIndex(nameField)));
+ assertEquals(testValue, c.getString(c.getColumnIndex(valueField)));
+ assertFalse(c.moveToNext());
+ } finally {
+ c.close();
+ }
+
+ v = new ContentValues();
+ // NAME is still needed, although the uri should be specific enough. Why?
+ v.put(nameField, testKey);
+ v.put(valueField, secondTestValue);
+ assertEquals(1, r.update(uri, v, null, null));
+
+ c = r.query(uri, null, null, null, null);
+ try {
+ assertTrue(c.moveToNext());
+ assertEquals(testKey, c.getString(c.getColumnIndex(nameField)));
+ assertEquals(secondTestValue, c.getString(c.getColumnIndex(valueField)));
+ assertFalse(c.moveToNext());
+ } finally {
+ c.close();
+ }
}
@MediumTest
@@ -139,7 +161,7 @@
ContentResolver r = getContext().getContentResolver();
// Make sure there's an owner
- assertTrue(findUser(um, UserHandle.USER_OWNER));
+ assertTrue(findUser(um, UserHandle.USER_SYSTEM));
// create a new user to use for testing
UserInfo otherUser = um.createUser("TestUser1", UserInfo.FLAG_GUEST);
@@ -148,21 +170,17 @@
assertNotSame("Current calling user id should not be the new guest user",
otherUser.id, UserHandle.getCallingUserId());
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "gps");
- Settings.Secure.putStringForUser(r,
- Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "network", otherUser.id);
+ final String testKey = "testSettingsChangeForOtherUser";
+ final String testValue1 = "value1";
+ final String testValue2 = "value2";
+ Settings.Secure.putString(r, testKey, testValue1);
+ Settings.Secure.putStringForUser(r, testKey, testValue2, otherUser.id);
- assertEquals("gps",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
- assertEquals("network", Settings.Secure.getStringForUser(
- r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, otherUser.id));
+ assertEquals(testValue1, Settings.Secure.getString(r, testKey));
+ assertEquals(testValue2, Settings.Secure.getStringForUser(r, testKey, otherUser.id));
assertNotSame("Current calling user id should not be the new guest user",
otherUser.id, UserHandle.getCallingUserId());
- Settings.Secure.setLocationProviderEnabledForUser(r, "network", false, otherUser.id);
- assertEquals("", Settings.Secure.getStringForUser(
- r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, otherUser.id));
-
} finally {
// Tidy up
um.removeUser(otherUser.id);
@@ -170,6 +188,7 @@
}
@MediumTest
+ @Suppress // Settings.Bookmarks uses a query format that's not supported now.
public void testRowNumberContentUri() {
ContentResolver r = getContext().getContentResolver();
@@ -196,47 +215,56 @@
public void testParseProviderList() {
ContentResolver r = getContext().getContentResolver();
- // Make sure we get out what we put in.
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
- "test1,test2,test3");
- assertEquals(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED),
- "test1,test2,test3");
-
+ // We only accept "+value" and "-value"
// Test adding a value
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
- "");
Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+test1");
- assertEquals("test1",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test1"));
// Test adding a second value
Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+test2");
- assertEquals("test1,test2",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test1"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test2"));
// Test adding a third value
Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+test3");
- assertEquals("test1,test2,test3",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test1"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test2"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test3"));
// Test deleting the first value in a 3 item list
Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "-test1");
- assertEquals("test2,test3",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ assertFalse(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test1"));
// Test deleting the middle value in a 3 item list
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
- "test1,test2,test3");
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "-test2");
- assertEquals("test1,test3",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+test4");
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test2"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test3"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test4"));
+ Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "-test3");
+ assertFalse(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test3"));
// Test deleting the last value in a 3 item list
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
- "test1,test2,test3");
- Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "-test3");
- assertEquals("test1,test2",
- Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED));
+ Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+test5");
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test2"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test4"));
+ assertTrue(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test5"));
+ Settings.Secure.putString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "-test5");
+ assertFalse(Settings.Secure.getString(r, Settings.Secure.LOCATION_PROVIDERS_ALLOWED)
+ .contains("test5"));
}
private boolean findUser(UserManager um, int userHandle) {
@@ -254,7 +282,7 @@
ContentResolver r = getContext().getContentResolver();
// Make sure there's an owner
- assertTrue(findUser(um, UserHandle.USER_OWNER));
+ assertTrue(findUser(um, UserHandle.USER_SYSTEM));
// create a new user to use for testing
UserInfo user = um.createUser("TestUser1", UserInfo.FLAG_GUEST);
@@ -266,12 +294,12 @@
final int SELF_VALUE = 40;
final int OTHER_VALUE = 27;
- Settings.System.putInt(r, TEST_KEY, SELF_VALUE);
- Settings.System.putIntForUser(r, TEST_KEY, OTHER_VALUE, user.id);
+ Settings.Secure.putInt(r, TEST_KEY, SELF_VALUE);
+ Settings.Secure.putIntForUser(r, TEST_KEY, OTHER_VALUE, user.id);
// Verify that they read back as intended
- int myValue = Settings.System.getInt(r, TEST_KEY, 0);
- int otherValue = Settings.System.getIntForUser(r, TEST_KEY, 0, user.id);
+ int myValue = Settings.Secure.getInt(r, TEST_KEY, 0);
+ int otherValue = Settings.Secure.getIntForUser(r, TEST_KEY, 0, user.id);
assertTrue("Running as user " + UserHandle.myUserId()
+ " and reading/writing as user " + user.id
+ ", expected to read " + SELF_VALUE + " but got " + myValue,
@@ -310,7 +338,8 @@
assertCanBeHandled(new Intent(Settings.ACTION_MEMORY_CARD_SETTINGS));
assertCanBeHandled(new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS));
assertCanBeHandled(new Intent(Settings.ACTION_PRIVACY_SETTINGS));
- assertCanBeHandled(new Intent(Settings.ACTION_QUICK_LAUNCH_SETTINGS));
+ //TODO: seems no one is using this anymore.
+// assertCanBeHandled(new Intent(Settings.ACTION_QUICK_LAUNCH_SETTINGS));
assertCanBeHandled(new Intent(Settings.ACTION_SEARCH_SETTINGS));
assertCanBeHandled(new Intent(Settings.ACTION_SECURITY_SETTINGS));
assertCanBeHandled(new Intent(Settings.ACTION_SETTINGS));
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 5a14967..ee296d9 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -109,7 +109,7 @@
static String dbNameForUser(final int userHandle) {
// The owner gets the unadorned db name;
- if (userHandle == UserHandle.USER_OWNER) {
+ if (userHandle == UserHandle.USER_SYSTEM) {
return DATABASE_NAME;
} else {
// Place the database in the user-specific data tree so that it's
@@ -186,8 +186,8 @@
createSecureTable(db);
- // Only create the global table for the singleton 'owner' user
- if (mUserHandle == UserHandle.USER_OWNER) {
+ // Only create the global table for the singleton 'owner/system' user
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
createGlobalTable(db);
}
@@ -1252,7 +1252,7 @@
if (upgradeVersion == 82) {
// Move to per-user settings dbs
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
@@ -1306,7 +1306,7 @@
}
if (upgradeVersion == 84) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1331,7 +1331,7 @@
}
if (upgradeVersion == 85) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
// Fix up the migration, ignoring already-migrated elements, to snap up to
@@ -1348,7 +1348,7 @@
}
if (upgradeVersion == 86) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] settingsToMove = {
@@ -1367,7 +1367,7 @@
}
if (upgradeVersion == 87) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] settingsToMove = {
@@ -1386,7 +1386,7 @@
}
if (upgradeVersion == 88) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] settingsToMove = {
@@ -1432,7 +1432,7 @@
}
if (upgradeVersion == 89) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] prefixesToMove = {
@@ -1452,7 +1452,7 @@
}
if (upgradeVersion == 90) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] systemToGlobal = {
@@ -1485,7 +1485,7 @@
}
if (upgradeVersion == 91) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
// Move ringer mode from system to global settings
@@ -1505,7 +1505,7 @@
try {
stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
+ " VALUES(?,?);");
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
// consider existing primary users to have made it through user setup
// if the globally-scoped device-provisioned bit is set
// (indicating they already made it through setup as primary)
@@ -1526,7 +1526,7 @@
if (upgradeVersion == 93) {
// Redo this step, since somehow it didn't work the first time for some users
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
// Migrate now-global settings
@@ -1547,7 +1547,7 @@
if (upgradeVersion == 94) {
// Add wireless charging started sound setting
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1565,7 +1565,7 @@
}
if (upgradeVersion == 95) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
try {
String[] settingsToMove = { Settings.Global.BUGREPORT_IN_POWER_MENU };
@@ -1584,7 +1584,7 @@
}
if (upgradeVersion == 97) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1613,7 +1613,7 @@
if (upgradeVersion == 100) {
// note: LOCK_SCREEN_SHOW_NOTIFICATIONS now handled in version 106
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1631,7 +1631,7 @@
}
if (upgradeVersion == 101) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1653,7 +1653,7 @@
try {
// The INSTALL_NON_MARKET_APPS setting is becoming per-user rather
// than device-global.
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
// In the owner user, the global table exists so we can migrate the
// entry from there to the secure table, preserving its value.
String[] globalToSecure = {
@@ -1693,7 +1693,7 @@
}
if (upgradeVersion < 105) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1719,7 +1719,7 @@
+ " VALUES(?,?);");
loadIntegerSetting(stmt, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS,
R.integer.def_lock_screen_show_notifications);
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
final int oldShow = getIntValueFromTable(db,
TABLE_GLOBAL, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, -1);
if (oldShow >= 0) {
@@ -1741,7 +1741,7 @@
if (upgradeVersion < 107) {
// Add trusted sound setting
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1816,7 +1816,7 @@
if (upgradeVersion < 111) {
// reset ringer mode, so it doesn't force zen mode to follow
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1833,7 +1833,7 @@
}
if (upgradeVersion < 112) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
// When device name was added, we went with Manufacturer + Model, device name should
// actually be Model only.
// Update device name to Model if it wasn't modified by user.
@@ -1874,7 +1874,7 @@
// We skipped 114 to handle a merge conflict with the introduction of theater mode.
if (upgradeVersion < 115) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -1892,7 +1892,7 @@
}
if (upgradeVersion < 116) {
- if (mUserHandle == UserHandle.USER_OWNER) {
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
db.beginTransaction();
SQLiteStatement stmt = null;
try {
@@ -2066,7 +2066,7 @@
LockPatternUtils lpu = new LockPatternUtils(mContext);
List<LockPatternView.Cell> cellPattern =
LockPatternUtils.stringToPattern(lockPattern);
- lpu.saveLockPattern(cellPattern, null, UserHandle.USER_OWNER);
+ lpu.saveLockPattern(cellPattern, null, UserHandle.USER_SYSTEM);
} catch (IllegalArgumentException e) {
// Don't want corrupted lock pattern to hang the reboot process
}
@@ -2343,8 +2343,8 @@
private void loadSettings(SQLiteDatabase db) {
loadSystemSettings(db);
loadSecureSettings(db);
- // The global table only exists for the 'owner' user
- if (mUserHandle == UserHandle.USER_OWNER) {
+ // The global table only exists for the 'owner/system' user
+ if (mUserHandle == UserHandle.USER_SYSTEM) {
loadGlobalSettings(db);
}
}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index 952b220..1d71346 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -123,7 +123,8 @@
}
if (sBroadcastOnRestore.contains(name)) {
- oldValue = table.lookup(cr, name, UserHandle.USER_OWNER);
+ // TODO: http://b/22388012
+ oldValue = table.lookup(cr, name, UserHandle.USER_SYSTEM);
sendBroadcast = true;
}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 73971ad..8b1caf9 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -18,7 +18,7 @@
import android.Manifest;
import android.app.ActivityManager;
-import android.app.AppOpsManager;
+import android.app.AppGlobals;
import android.app.backup.BackupManager;
import android.content.BroadcastReceiver;
import android.content.ContentProvider;
@@ -27,6 +27,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
@@ -47,6 +48,7 @@
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.Process;
+import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -208,13 +210,13 @@
private volatile UserManager mUserManager;
// We have to call in the package manager with no lock held,
- private volatile PackageManager mPackageManager;
+ private volatile IPackageManager mPackageManager;
@Override
public boolean onCreate() {
synchronized (mLock) {
- mUserManager = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
- mPackageManager = getContext().getPackageManager();
+ mUserManager = UserManager.get(getContext());
+ mPackageManager = AppGlobals.getPackageManager();
mSettingsRegistry = new SettingsRegistry();
}
registerBroadcastReceivers();
@@ -496,7 +498,7 @@
}
private void dumpForUser(int userId, PrintWriter pw) {
- if (userId == UserHandle.USER_OWNER) {
+ if (userId == UserHandle.USER_SYSTEM) {
pw.println("GLOBAL SETTINGS (user " + userId + ")");
Cursor globalCursor = getAllGlobalSettings(ALL_COLUMNS);
dumpSettings(globalCursor, pw);
@@ -547,7 +549,7 @@
@Override
public void onReceive(Context context, Intent intent) {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
- UserHandle.USER_OWNER);
+ UserHandle.USER_SYSTEM);
switch (intent.getAction()) {
case Intent.ACTION_USER_REMOVED: {
@@ -584,7 +586,7 @@
synchronized (mLock) {
// Get the settings.
SettingsState settingsState = mSettingsRegistry.getSettingsLocked(
- SettingsRegistry.SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER);
+ SettingsRegistry.SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM);
List<String> names = settingsState.getSettingNamesLocked();
@@ -612,7 +614,7 @@
// Get the value.
synchronized (mLock) {
return mSettingsRegistry.getSettingLocked(SettingsRegistry.SETTINGS_TYPE_GLOBAL,
- UserHandle.USER_OWNER, name);
+ UserHandle.USER_SYSTEM, name);
}
}
@@ -656,19 +658,19 @@
case MUTATION_OPERATION_INSERT: {
return mSettingsRegistry
.insertSettingLocked(SettingsRegistry.SETTINGS_TYPE_GLOBAL,
- UserHandle.USER_OWNER, name, value, getCallingPackage());
+ UserHandle.USER_SYSTEM, name, value, getCallingPackage());
}
case MUTATION_OPERATION_DELETE: {
return mSettingsRegistry.deleteSettingLocked(
SettingsRegistry.SETTINGS_TYPE_GLOBAL,
- UserHandle.USER_OWNER, name);
+ UserHandle.USER_SYSTEM, name);
}
case MUTATION_OPERATION_UPDATE: {
return mSettingsRegistry
.updateSettingLocked(SettingsRegistry.SETTINGS_TYPE_GLOBAL,
- UserHandle.USER_OWNER, name, value, getCallingPackage());
+ UserHandle.USER_SYSTEM, name, value, getCallingPackage());
}
}
}
@@ -903,7 +905,7 @@
}
// Enforce what the calling package can mutate the system settings.
- enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name);
+ enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name, runAsUserId);
// Resolve the userId on whose behalf the call is made.
final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(runAsUserId);
@@ -1001,7 +1003,7 @@
}
private void enforceRestrictedSystemSettingsMutationForCallingPackage(int operation,
- String name) {
+ String name, int userId) {
// System/root/shell can mutate whatever secure settings they want.
final int callingUid = Binder.getCallingUid();
if (callingUid == android.os.Process.SYSTEM_UID
@@ -1019,7 +1021,7 @@
}
// The calling package is already verified.
- PackageInfo packageInfo = getCallingPackageInfoOrThrow();
+ PackageInfo packageInfo = getCallingPackageInfoOrThrow(userId);
// Privileged apps can do whatever they want.
if ((packageInfo.applicationInfo.privateFlags
@@ -1039,7 +1041,7 @@
}
// The calling package is already verified.
- PackageInfo packageInfo = getCallingPackageInfoOrThrow();
+ PackageInfo packageInfo = getCallingPackageInfoOrThrow(userId);
// Privileged apps can do whatever they want.
if ((packageInfo.applicationInfo.privateFlags &
@@ -1053,17 +1055,17 @@
}
}
- private PackageInfo getCallingPackageInfoOrThrow() {
+ private PackageInfo getCallingPackageInfoOrThrow(int userId) {
try {
- return mPackageManager.getPackageInfo(getCallingPackage(), 0);
- } catch (PackageManager.NameNotFoundException e) {
+ return mPackageManager.getPackageInfo(getCallingPackage(), 0, userId);
+ } catch (RemoteException e) {
throw new IllegalStateException("Calling package doesn't exist");
}
}
private int getGroupParentLocked(int userId) {
// Most frequent use case.
- if (userId == UserHandle.USER_OWNER) {
+ if (userId == UserHandle.USER_SYSTEM) {
return userId;
}
// We are in the same process with the user manager and the returned
@@ -1401,8 +1403,8 @@
migrateLegacySettingsForUserIfNeededLocked(userId);
// Ensure global settings loaded if owner.
- if (userId == UserHandle.USER_OWNER) {
- final int globalKey = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER);
+ if (userId == UserHandle.USER_SYSTEM) {
+ final int globalKey = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM);
ensureSettingsStateLocked(globalKey);
}
@@ -1541,7 +1543,7 @@
private void migrateAllLegacySettingsIfNeeded() {
synchronized (mLock) {
- final int key = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER);
+ final int key = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM);
File globalFile = getSettingsFile(key);
if (globalFile.exists()) {
return;
@@ -1591,7 +1593,7 @@
private void migrateLegacySettingsForUserLocked(DatabaseHelper dbHelper,
SQLiteDatabase database, int userId) {
// Move over the global settings if owner.
- if (userId == UserHandle.USER_OWNER) {
+ if (userId == UserHandle.USER_SYSTEM) {
final int globalKey = makeKey(SETTINGS_TYPE_GLOBAL, userId);
ensureSettingsStateLocked(globalKey);
SettingsState globalSettings = mSettingsStates.get(globalKey);
@@ -1898,7 +1900,7 @@
}
// Set the global settings version if owner.
- if (mUserId == UserHandle.USER_OWNER) {
+ if (mUserId == UserHandle.USER_SYSTEM) {
SettingsState globalSettings = getSettingsLocked(
SettingsRegistry.SETTINGS_TYPE_GLOBAL, mUserId);
globalSettings.setVersionLocked(newVersion);
@@ -1914,7 +1916,7 @@
}
private SettingsState getGlobalSettingsLocked() {
- return getSettingsLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER);
+ return getSettingsLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM);
}
private SettingsState getSecureSettingsLocked(int userId) {
@@ -1960,7 +1962,7 @@
// v119: Reset zen + ringer mode.
if (currentVersion == 118) {
- if (userId == UserHandle.USER_OWNER) {
+ if (userId == UserHandle.USER_SYSTEM) {
final SettingsState globalSettings = getGlobalSettingsLocked();
globalSettings.updateSettingLocked(Settings.Global.ZEN_MODE,
Integer.toString(Settings.Global.ZEN_MODE_OFF),
diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java
index c7cc89b..8e56f47 100644
--- a/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java
+++ b/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java
@@ -48,7 +48,7 @@
Settings.NameValueTable.NAME, Settings.NameValueTable.VALUE
};
- protected int mSecondaryUserId = UserHandle.USER_OWNER;
+ protected int mSecondaryUserId = UserHandle.USER_SYSTEM;
@Override
public void setContext(Context context) {
diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderPerformanceTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderPerformanceTest.java
index d581f3b..a09d5fe 100644
--- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderPerformanceTest.java
+++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderPerformanceTest.java
@@ -47,7 +47,7 @@
// Make sure the setting changed.
String firstValue = getStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL,
- FAKE_SETTING_NAME, UserHandle.USER_OWNER);
+ FAKE_SETTING_NAME, UserHandle.USER_SYSTEM);
assertEquals("Setting value didn't change", FAKE_SETTING_VALUE, firstValue);
// Set the setting to its second value.
@@ -56,7 +56,7 @@
// Make sure the setting changed.
String secondValue = getStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL,
- FAKE_SETTING_NAME, UserHandle.USER_OWNER);
+ FAKE_SETTING_NAME, UserHandle.USER_SYSTEM);
assertEquals("Setting value didn't change", FAKE_SETTING_VALUE_1, secondValue);
}
} finally {
@@ -86,20 +86,20 @@
for (int i = 0; i < ITERATION_COUNT; i++) {
// Set the setting to its first value.
setStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL, FAKE_SETTING_NAME,
- FAKE_SETTING_VALUE, UserHandle.USER_OWNER);
+ FAKE_SETTING_VALUE, UserHandle.USER_SYSTEM);
// Make sure the setting changed.
String firstValue = getStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL,
- FAKE_SETTING_NAME, UserHandle.USER_OWNER);
+ FAKE_SETTING_NAME, UserHandle.USER_SYSTEM);
assertEquals("Setting value didn't change", FAKE_SETTING_VALUE, firstValue);
// Set the setting to its second value.
setStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL, FAKE_SETTING_NAME,
- FAKE_SETTING_VALUE_1, UserHandle.USER_OWNER);
+ FAKE_SETTING_VALUE_1, UserHandle.USER_SYSTEM);
// Make sure the setting changed.
String secondValue = getStringViaFrontEndApiSetting(SETTING_TYPE_GLOBAL,
- FAKE_SETTING_NAME, UserHandle.USER_OWNER);
+ FAKE_SETTING_NAME, UserHandle.USER_SYSTEM);
assertEquals("Setting value didn't change", FAKE_SETTING_VALUE_1, secondValue);
}
} finally {
diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
index ad56b9d..8ca1b46 100644
--- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
+++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
@@ -46,40 +46,40 @@
private final Object mLock = new Object();
- public void testSetAndGetGlobalViaFrontEndApiForOwnerUser() throws Exception {
- performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_GLOBAL, UserHandle.USER_OWNER);
+ public void testSetAndGetGlobalViaFrontEndApiForSystemUser() throws Exception {
+ performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_GLOBAL, UserHandle.USER_SYSTEM);
}
- public void testSetAndGetGlobalViaFrontEndApiForNonOwnerUser() throws Exception {
- if (mSecondaryUserId == UserHandle.USER_OWNER) {
+ public void testSetAndGetGlobalViaFrontEndApiForNonSystemUser() throws Exception {
+ if (mSecondaryUserId == UserHandle.USER_SYSTEM) {
Log.w(LOG_TAG, "No secondary user. Skipping "
- + "testSetAndGetGlobalViaFrontEndApiForNonOwnerUser");
+ + "testSetAndGetGlobalViaFrontEndApiForNonSystemUser");
return;
}
performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_GLOBAL, mSecondaryUserId);
}
- public void testSetAndGetSecureViaFrontEndApiForOwnerUser() throws Exception {
- performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SECURE, UserHandle.USER_OWNER);
+ public void testSetAndGetSecureViaFrontEndApiForSystemUser() throws Exception {
+ performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SECURE, UserHandle.USER_SYSTEM);
}
- public void testSetAndGetSecureViaFrontEndApiForNonOwnerUser() throws Exception {
- if (mSecondaryUserId == UserHandle.USER_OWNER) {
+ public void testSetAndGetSecureViaFrontEndApiForNonSystemUser() throws Exception {
+ if (mSecondaryUserId == UserHandle.USER_SYSTEM) {
Log.w(LOG_TAG, "No secondary user. Skipping "
- + "testSetAndGetSecureViaFrontEndApiForNonOwnerUser");
+ + "testSetAndGetSecureViaFrontEndApiForNonSystemUser");
return;
}
performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SECURE, mSecondaryUserId);
}
- public void testSetAndGetSystemViaFrontEndApiForOwnerUser() throws Exception {
- performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SYSTEM, UserHandle.USER_OWNER);
+ public void testSetAndGetSystemViaFrontEndApiForSystemUser() throws Exception {
+ performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SYSTEM, UserHandle.USER_SYSTEM);
}
- public void testSetAndGetSystemViaFrontEndApiForNonOwnerUser() throws Exception {
- if (mSecondaryUserId == UserHandle.USER_OWNER) {
+ public void testSetAndGetSystemViaFrontEndApiForNonSystemUser() throws Exception {
+ if (mSecondaryUserId == UserHandle.USER_SYSTEM) {
Log.w(LOG_TAG, "No secondary user. Skipping "
- + "testSetAndGetSystemViaFrontEndApiForNonOwnerUser");
+ + "testSetAndGetSystemViaFrontEndApiForNonSystemUser");
return;
}
performSetAndGetSettingTestViaFrontEndApi(SETTING_TYPE_SYSTEM, mSecondaryUserId);
@@ -357,7 +357,7 @@
public void run() {
insertStringViaProviderApi(type, name, value, withTableRowUri);
}
- }, type, name, value, UserHandle.USER_OWNER);
+ }, type, name, value, UserHandle.USER_SYSTEM);
}
private void setSettingAndAssertSuccessfulChange(Runnable setCommand, final int type,