diff options
| author | Christopher Tate <ctate@google.com> | 2013-09-03 17:53:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-03 17:53:50 -0700 |
| commit | 513459da2d81d925c7791ea88ccbe85efcb3c642 (patch) | |
| tree | 811aabe0d155503ff1e2a02ef1927b841d17f45b /packages/SettingsProvider | |
| parent | afb0317fa09280cc57ccd1ab11efa5dfc8ff2235 (diff) | |
| parent | 3fabe12bf8a16540af38d1934d6590949c9d1fff (diff) | |
| download | frameworks_base-513459da2d81d925c7791ea88ccbe85efcb3c642.zip frameworks_base-513459da2d81d925c7791ea88ccbe85efcb3c642.tar.gz frameworks_base-513459da2d81d925c7791ea88ccbe85efcb3c642.tar.bz2 | |
am 3fabe12b: am d0688beb: Merge "Sanity check users before committing new Android ID" into klp-dev
* commit '3fabe12bf8a16540af38d1934d6590949c9d1fff':
Sanity check users before committing new Android ID
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 6753922..a5dab33 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -33,6 +33,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.pm.UserInfo; import android.content.res.AssetFileDescriptor; import android.database.AbstractCursor; import android.database.Cursor; @@ -477,6 +478,13 @@ public class SettingsProvider extends ContentProvider { try { final String value = c.moveToNext() ? c.getString(0) : null; if (value == null) { + // sanity-check the user before touching the db + final UserInfo user = mUserManager.getUserInfo(userHandle); + if (user == null) { + // can happen due to races when deleting users; treat as benign + return false; + } + final SecureRandom random = new SecureRandom(); final String newAndroidIdValue = Long.toHexString(random.nextLong()); final ContentValues values = new ContentValues(); @@ -490,7 +498,7 @@ public class SettingsProvider extends ContentProvider { Slog.d(TAG, "Generated and saved new ANDROID_ID [" + newAndroidIdValue + "] for user " + userHandle); // Write a dropbox entry if it's a restricted profile - if (mUserManager.getUserInfo(userHandle).isRestricted()) { + if (user.isRestricted()) { DropBoxManager dbm = (DropBoxManager) getContext().getSystemService(Context.DROPBOX_SERVICE); if (dbm != null && dbm.isTagEnabled(DROPBOX_TAG_USERLOG)) { |