From b0d6dd92e83232a4db5721336fa449ddaf4eb838 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Mon, 3 Jan 2022 13:41:47 +0100 Subject: [PATCH] sdk: s/UserHandle.USER_OWNER/UserHandle.USER_SYSTEM/g USER_OWNER has been deprecated and replaced by USER_SYSTEM Change-Id: I93b057a52dcdcb3760b7c2139bea2e25a624a78f --- .../lineagesettings/LineageDatabaseHelper.java | 6 +++--- .../lineagesettings/LineageSettingsProvider.java | 6 +++--- .../tests/LineageSettingsProviderDefaultsTest.java | 12 ++++++------ .../tests/LineageSettingsProviderTest.java | 2 +- .../java/lineageos/preference/ConstraintsHelper.java | 2 +- .../org/lineageos/internal/util/PowerMenuUtils.java | 2 +- .../tests/providers/LineageSettingsTest.java | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 2fb248fa..a9d9f184 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -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); } } diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageSettingsProvider.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageSettingsProvider.java index c843f05a..06e4324f 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageSettingsProvider.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageSettingsProvider.java @@ -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; } /** diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java index 247d324c..27953452 100644 --- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java +++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java @@ -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!"); } diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java index 3eb5d935..8f8f25bd 100644 --- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java +++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java @@ -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); diff --git a/sdk/src/java/lineageos/preference/ConstraintsHelper.java b/sdk/src/java/lineageos/preference/ConstraintsHelper.java index f883cb98..06e81a26 100644 --- a/sdk/src/java/lineageos/preference/ConstraintsHelper.java +++ b/sdk/src/java/lineageos/preference/ConstraintsHelper.java @@ -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; } diff --git a/sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java b/sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java index de2ea147..0a3135b0 100644 --- a/sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java +++ b/sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java @@ -28,7 +28,7 @@ public final class PowerMenuUtils { boolean keyguardLocked = km.inKeyguardRestrictedInputMode() && km.isKeyguardSecure(); boolean advancedRestartEnabled = LineageSettings.Secure.getInt(context.getContentResolver(), LineageSettings.Secure.ADVANCED_REBOOT, 0) == 1; - boolean isPrimaryUser = UserHandle.getCallingUserId() == UserHandle.USER_OWNER; + boolean isPrimaryUser = UserHandle.getCallingUserId() == UserHandle.USER_SYSTEM; return advancedRestartEnabled && !keyguardLocked && isPrimaryUser; } diff --git a/tests/src/org/lineageos/tests/providers/LineageSettingsTest.java b/tests/src/org/lineageos/tests/providers/LineageSettingsTest.java index d6f61e80..d928a2df 100644 --- a/tests/src/org/lineageos/tests/providers/LineageSettingsTest.java +++ b/tests/src/org/lineageos/tests/providers/LineageSettingsTest.java @@ -138,7 +138,7 @@ public class LineageSettingsTest extends AndroidTestCase{ sIsOnChangedCalled = false; sExpectedUriChange = LineageSettings.Global.getUriFor(key); mContentResolver.registerContentObserver(sExpectedUriChange, false, mTestObserver, - UserHandle.USER_OWNER); + UserHandle.USER_SYSTEM); // replace final String expectedReplaceValue = "globalTestValue2";