diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-02-17 13:39:12 -0500 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2015-03-04 16:04:22 -0500 |
| commit | fca04ca0965d5e04dacc025b77f2b4881ee1afd8 (patch) | |
| tree | 682f2bbb11ad5e3481694fec7e225c500cbc0bf8 /api | |
| parent | aa7e7318e3bd33dc40792d35ca3a29d8d9ada4a2 (diff) | |
| download | frameworks_base-fca04ca0965d5e04dacc025b77f2b4881ee1afd8.zip frameworks_base-fca04ca0965d5e04dacc025b77f2b4881ee1afd8.tar.gz frameworks_base-fca04ca0965d5e04dacc025b77f2b4881ee1afd8.tar.bz2 | |
Allow device and profile owners to set a user icon.
Change-Id: I7c2bafb85cff3fa063af7a2f27b76c69172f0525
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 163e9d0..09bb39e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5543,6 +5543,7 @@ package android.app.admin { method public int setStorageEncryption(android.content.ComponentName, boolean); method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean); method public boolean setUserEnabled(android.content.ComponentName); + method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); method public void uninstallAllUserCaCerts(android.content.ComponentName); method public void uninstallCaCert(android.content.ComponentName, byte[]); diff --git a/api/system-current.txt b/api/system-current.txt index 8a9259f..15cd47f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5645,6 +5645,7 @@ package android.app.admin { method public int setStorageEncryption(android.content.ComponentName, boolean); method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean); method public boolean setUserEnabled(android.content.ComponentName); + method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); method public void uninstallAllUserCaCerts(android.content.ComponentName); method public void uninstallCaCert(android.content.ComponentName, byte[]); @@ -30906,8 +30907,8 @@ package android.telecom { method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS"; field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE"; - field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; + field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' |