diff options
author | Makoto Onuki <omakoto@google.com> | 2015-03-30 20:42:20 +0000 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2015-03-30 20:42:20 +0000 |
commit | 4fd8d4ab2aafe8ed73080408223e8b20a953cfc4 (patch) | |
tree | 4a3e854457fce9735c78f1d94cb4855562c71cbc /core/java/android/app | |
parent | 75a0882b946df6de4775c9e54ca023ff54f3f678 (diff) | |
download | frameworks_base-4fd8d4ab2aafe8ed73080408223e8b20a953cfc4.zip frameworks_base-4fd8d4ab2aafe8ed73080408223e8b20a953cfc4.tar.gz frameworks_base-4fd8d4ab2aafe8ed73080408223e8b20a953cfc4.tar.bz2 |
Revert "Enterprise quick contact 1/2"
This reverts commit 75a0882b946df6de4775c9e54ca023ff54f3f678.
Change-Id: Ibe332885824b228bf1b1147d141c9395554ff67f
Diffstat (limited to 'core/java/android/app')
-rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 16 | ||||
-rw-r--r-- | core/java/android/app/admin/IDevicePolicyManager.aidl | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index cbb0f51..cf6619f 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3165,22 +3165,6 @@ public class DevicePolicyManager { } /** - * Start Quick Contact on the managed profile for the current user, if the policy allows. - * @hide - */ - public void startManagedQuickContact(String actualLookupKey, long actualContactId, - Intent originalIntent) { - if (mService != null) { - try { - mService.startManagedQuickContact( - actualLookupKey, actualContactId, originalIntent); - } catch (RemoteException e) { - Log.w(TAG, "Failed talking with device policy service", e); - } - } - } - - /** * Called by the profile owner of a managed profile so that some intents sent in the managed * profile can also be resolved in the parent, or vice versa. * Only activity intents are supported. diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 73b0684..9ca52e5 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -189,7 +189,6 @@ interface IDevicePolicyManager { void setCrossProfileCallerIdDisabled(in ComponentName who, boolean disabled); boolean getCrossProfileCallerIdDisabled(in ComponentName who); boolean getCrossProfileCallerIdDisabledForUser(int userId); - void startManagedQuickContact(String lookupKey, long contactId, in Intent originalIntent); void setTrustAgentConfiguration(in ComponentName admin, in ComponentName agent, in PersistableBundle args); |