PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename UserId to UserHandle.

Browse Source 
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
This commit is contained in:
Dianne Hackborn
2012-08-16 11:01:57 -07:00
parent 704ca026e0
commit bb06a427eb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/Settings.java
View File

@@ -40,7 +40,7 @@ import android.os.Bundle;
import android.os.INetworkManagementService;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserId;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceActivity.Header;
@@ -415,13 +415,13 @@ public class Settings extends PreferenceActivity
i = insertAccountsHeaders(target, headerIndex);
} else if (id == R.id.user_settings) {
if (!mEnableUserManagement
|| !UserId.MU_ENABLED || UserId.myUserId() != 0
|| !UserHandle.MU_ENABLED || UserHandle.myUserId() != 0
|| !getResources().getBoolean(R.bool.enable_user_management)
|| Utils.isMonkeyRunning()) {
target.remove(header);
}
}
if (UserId.MU_ENABLED && UserId.myUserId() != 0
if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
target.remove(header);
}