Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdk: s/UserHandle.USER_OWNER/UserHandle.USER_SYSTEM/g

Browse Source 
USER_OWNER has been deprecated and replaced by USER_SYSTEM

Change-Id: I93b057a52dcdcb3760b7c2139bea2e25a624a78f
This commit is contained in:
Luca Stefani
2022-01-03 13:41:47 +01:00
parent d787f12781
commit b0d6dd92e8
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
View File

@@ -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);
}
}

6
packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageSettingsProvider.java
View File

@@ -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;
}
/**

12
packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
View File

@@ -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!");
}

2
packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java
View File

@@ -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);

2
sdk/src/java/lineageos/preference/ConstraintsHelper.java
View File

@@ -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;
}

2
sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java
View File

@@ -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;
}

2
tests/src/org/lineageos/tests/providers/LineageSettingsTest.java
View File

@@ -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";