Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 659651b..0177504 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.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;
@@ -107,6 +108,9 @@
*/
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
@@ -486,6 +490,16 @@
}
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 {