diff options
| author | Christopher Tate <ctate@google.com> | 2013-09-04 00:48:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 00:48:06 +0000 |
| commit | d0688beb6890ca3888d08d250ad33655a2a588d5 (patch) | |
| tree | c2b71f2ff7c1b0cdfc92f5d65594f24617b6cf74 /packages | |
| parent | 979cf8e461c6790747b2bb6dcc4c0784ca34dbdd (diff) | |
| parent | 38e7a60fd7fecdf1c6593724111a92147b4c50ff (diff) | |
| download | frameworks_base-d0688beb6890ca3888d08d250ad33655a2a588d5.zip frameworks_base-d0688beb6890ca3888d08d250ad33655a2a588d5.tar.gz frameworks_base-d0688beb6890ca3888d08d250ad33655a2a588d5.tar.bz2 | |
Merge "Sanity check users before committing new Android ID" into klp-dev
Diffstat (limited to 'packages')
| -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)) { |