diff options
author | Amith Yamasani <yamasani@google.com> | 2013-06-28 10:48:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 10:48:54 -0700 |
commit | 7f50ef7ddafc6dc7d6419e312185160995047256 (patch) | |
tree | 7006655a83449ebf33dcb52dc7ace33e7a5836de /packages | |
parent | 8751a9644d301e40d03be3c9fc5b36bba9998d34 (diff) | |
parent | 3f0decd7dff8b4c12544c24b2d19a41d4eaacd03 (diff) | |
download | frameworks_base-7f50ef7ddafc6dc7d6419e312185160995047256.zip frameworks_base-7f50ef7ddafc6dc7d6419e312185160995047256.tar.gz frameworks_base-7f50ef7ddafc6dc7d6419e312185160995047256.tar.bz2 |
am 3f0decd7: am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
* commit '3f0decd7dff8b4c12544c24b2d19a41d4eaacd03':
When a new user AID is generated, dump it to dropbox
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index f894068..6753922 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -43,6 +43,7 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.Binder; import android.os.Bundle; +import android.os.DropBoxManager; import android.os.FileObserver; import android.os.ParcelFileDescriptor; import android.os.SystemProperties; @@ -106,6 +107,9 @@ public class SettingsProvider extends ContentProvider { */ static final HashSet<String> sSecureGlobalKeys; static final HashSet<String> sSystemGlobalKeys; + + private static final String DROPBOX_TAG_USERLOG = "restricted_profile_ssaid"; + static { // Keys (name column) from the 'secure' table that are now in the owner user's 'global' // table, shared across all users @@ -485,6 +489,16 @@ 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()) { + DropBoxManager dbm = (DropBoxManager) + getContext().getSystemService(Context.DROPBOX_SERVICE); + if (dbm != null && dbm.isTagEnabled(DROPBOX_TAG_USERLOG)) { + dbm.addText(DROPBOX_TAG_USERLOG, System.currentTimeMillis() + + ",restricted_profile_ssaid," + + newAndroidIdValue + "\n"); + } + } } return true; } finally { |