Import Android SDK Platform P [4477446]

/google/data/ro/projects/android/fetch_artifact \
    --bid 4477446 \
    --target sdk_phone_armv7-win_sdk \
    sdk-repo-linux-sources-4477446.zip

AndroidVersion.ApiLevel has been modified to appear as 28

Change-Id: If0559643d7c328e36aafca98f0c114641d33642c

1 files changed, 16 insertions, 0 deletions

diff --git a/com/android/internal/telephony/Phone.java b/com/android/internal/telephony/Phone.java
index c51a5fe4..d702c09b 100644
--- a/com/android/internal/telephony/Phone.java
+++ b/com/android/internal/telephony/Phone.java
@@ -2881,6 +2881,13 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
     }
 
     /**
+     * Retrieves the EF_PNN from the UICC For GSM/UMTS phones.
+     */
+    public String getPlmn() {
+        return null;
+    }
+
+    /**
      * Get the current for the default apn DataState. No change notification
      * exists at this interface -- use
      * {@link android.telephony.PhoneStateListener} instead.
@@ -2985,6 +2992,15 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
         return;
     }
 
+    public int getCarrierId() {
+        // TODO remove hardcoding and expose a public API for INVALID CARRIER ID
+        return -1;
+    }
+
+    public String getCarrierName() {
+        return null;
+    }
+
     /**
      * Return if UT capability of ImsPhone is enabled or not
      */