sdk: s/UserHandle.USER_OWNER/UserHandle.USER_SYSTEM/g (b0d6dd92) · Commits · e / os / android_lineage-sdk

packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
		* @return The database path string
		*/
		private static String dbNameForUser(Context context, int userId, String baseName) {
		if (userId == UserHandle.USER_OWNER) {
		if (userId == UserHandle.USER_SYSTEM) {
		return context.getDatabasePath(baseName).getPath();
		} else {
		// Place the database in the user-specific data tree so that it's
		@@ -177,7 +177,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
		createDbTable(db, LineageTableNames.TABLE_SYSTEM);
		createDbTable(db, LineageTableNames.TABLE_SECURE);

		if (mUserHandle == UserHandle.USER_OWNER) {
		if (mUserHandle == UserHandle.USER_SYSTEM) {
		createDbTable(db, LineageTableNames.TABLE_GLOBAL);
		}

		@@ -468,7 +468,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
		loadSystemSettings(db);
		loadSecureSettings(db);
		// The global table only exists for the 'owner' user
		if (mUserHandle == UserHandle.USER_OWNER) {
		if (mUserHandle == UserHandle.USER_SYSTEM) {
		loadGlobalSettings(db);
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ public class LineageSettingsProvider extends ContentProvider {

		mUserManager = UserManager.get(getContext());

		establishDbTracking(UserHandle.USER_OWNER);
		establishDbTracking(UserHandle.USER_SYSTEM);

		mUriBuilder = new Uri.Builder();
		mUriBuilder.scheme(ContentResolver.SCHEME_CONTENT);
		@@ -126,7 +126,7 @@ public class LineageSettingsProvider extends ContentProvider {
		@Override
		public void onReceive(Context context, Intent intent) {
		final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		String action = intent.getAction();

		if (LOCAL_LOGV) Log.d(TAG, "Received intent: " + action + " for user: " + userId);
		@@ -861,7 +861,7 @@ public class LineageSettingsProvider extends ContentProvider {
		*/
		private int getUserIdForTable(String tableName, int userId) {
		return LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL.equals(tableName) ?
		UserHandle.USER_OWNER : userId;
		UserHandle.USER_SYSTEM : userId;
		}

		/**

+6 −6

Original line number	Diff line number	Diff line
		@@ -196,13 +196,13 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
		switch (table) {
		case LineageDatabaseHelper.LineageTableNames.TABLE_SYSTEM:
		return LineageSettings.System.getIntForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		case LineageDatabaseHelper.LineageTableNames.TABLE_SECURE:
		return LineageSettings.Secure.getIntForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		case LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL:
		return LineageSettings.Global.getIntForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		default:
		throw new AssertionError("Invalid or empty table!");
		}
		@@ -213,13 +213,13 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
		switch (table) {
		case LineageDatabaseHelper.LineageTableNames.TABLE_SYSTEM:
		return LineageSettings.System.getStringForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		case LineageDatabaseHelper.LineageTableNames.TABLE_SECURE:
		return LineageSettings.Secure.getStringForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		case LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL:
		return LineageSettings.Global.getStringForUser(mContentResolver, setting.mKey,
		UserHandle.USER_OWNER);
		UserHandle.USER_SYSTEM);
		default:
		throw new AssertionError("Invalid or empty table!");
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ import java.util.Map;
		@MediumTest
		public void testMigrateLineageSettingsForOtherUser() {
		// Make sure there's an owner
		assertTrue(findUser(mUserManager, UserHandle.USER_OWNER));
		assertTrue(findUser(mUserManager, UserHandle.USER_SYSTEM));

		mGuest = mUserManager.createGuest(mContext, "GuestUser1");
		assertNotNull(mGuest);

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ public class ConstraintsHelper {

		// Check if the current user is an owner
		boolean rOwner = a.getBoolean(R.styleable.lineage_SelfRemovingPreference_requiresOwner, false);
		if (rOwner && UserHandle.myUserId() != UserHandle.USER_OWNER) {
		if (rOwner && UserHandle.myUserId() != UserHandle.USER_SYSTEM) {
		return false;
		}