From 8b74c4f67ec389f845057dd5b839428c897a667b Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Wed, 18 Jun 2014 13:01:26 -0700 Subject: [PATCH 1/2] Add getSystemPhoneApplication to TelecommManager Change-Id: Ie67698e8363d1498b37692dc7be23b14a0d8c388 --- telecomm/java/android/telecomm/TelecommManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index a97e7e499f5fa..989c2cd0b19ee 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -16,7 +16,9 @@ package android.telecomm; +import android.content.ComponentName; import android.content.Context; +import android.os.RemoteException; import com.android.internal.telecomm.ITelecommService; @@ -45,4 +47,14 @@ public class TelecommManager { public static TelecommManager from(Context context) { return (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE); } + + /** {@hide} */ + public ComponentName getSystemPhoneApplication() { + try { + return mService.getSystemPhoneApplication(); + } catch (RemoteException e) { + Log.e(TAG, e, "Error calling ITelecommService#getSystemPhoneApplication"); + return null; + } + } } From 5e0f061c0fc32c27cf107041c222c6eb9e3a65ab Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Thu, 19 Jun 2014 22:25:13 +0000 Subject: [PATCH 2/2] Revert "Add getSystemPhoneApplication to TelecommManager" This reverts commit 8200c05dcf206f2621fc8017235c739b66d57e8b. Change-Id: I6536627491830804ddedac0287fa0bcdf014280c --- telecomm/java/android/telecomm/TelecommManager.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index 989c2cd0b19ee..a97e7e499f5fa 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -16,9 +16,7 @@ package android.telecomm; -import android.content.ComponentName; import android.content.Context; -import android.os.RemoteException; import com.android.internal.telecomm.ITelecommService; @@ -47,14 +45,4 @@ public class TelecommManager { public static TelecommManager from(Context context) { return (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE); } - - /** {@hide} */ - public ComponentName getSystemPhoneApplication() { - try { - return mService.getSystemPhoneApplication(); - } catch (RemoteException e) { - Log.e(TAG, e, "Error calling ITelecommService#getSystemPhoneApplication"); - return null; - } - } }