diff options
| author | Wink Saville <wink@google.com> | 2014-09-09 00:00:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 00:00:49 +0000 |
| commit | 40e9f393df3545af8a068c4b1994ac486597790d (patch) | |
| tree | 22ffb956c5d7fd3bd2d260b2d3a6268f75f39ac9 /telephony | |
| parent | 4009b98f73628043f0b3db4c7ace1aa71a191a6b (diff) | |
| parent | 96b3e61ff6476ff1c5ad7cce725b374d9f87e868 (diff) | |
| download | frameworks_base-40e9f393df3545af8a068c4b1994ac486597790d.zip frameworks_base-40e9f393df3545af8a068c4b1994ac486597790d.tar.gz frameworks_base-40e9f393df3545af8a068c4b1994ac486597790d.tar.bz2 | |
Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 93c49ba..38b61ae 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -772,6 +772,7 @@ public class TelephonyManager { * * {@hide} */ + @SystemApi public int getCurrentPhoneType() { return getCurrentPhoneType(getDefaultSubscription()); } @@ -786,6 +787,7 @@ public class TelephonyManager { * @param subId for which phone type is returned */ /** {@hide} */ + @SystemApi public int getCurrentPhoneType(long subId) { try{ |