am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev

* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService

api/current.txt

@@ -28678,7 +28678,8 @@ package android.service.carrier {
 
   public abstract class CarrierService extends android.app.Service {
     ctor public CarrierService();
-    method public final android.os.IBinder onBind(android.content.Intent);
+    method public final void notifyCarrierNetworkChange(boolean);
+    method public android.os.IBinder onBind(android.content.Intent);
     method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
     field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
     field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
@@ -31247,7 +31248,6 @@ package android.telephony {
     method public boolean isVoiceCapable();
     method public boolean isWorldPhone();
     method public void listen(android.telephony.PhoneStateListener, int);
-    method public void notifyCarrierNetworkChange(boolean);
     method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
     method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
     method public boolean setOperatorBrandOverride(java.lang.String);

api/system-current.txt

@@ -30711,7 +30711,8 @@ package android.service.carrier {
 
   public abstract class CarrierService extends android.app.Service {
     ctor public CarrierService();
-    method public final android.os.IBinder onBind(android.content.Intent);
+    method public final void notifyCarrierNetworkChange(boolean);
+    method public android.os.IBinder onBind(android.content.Intent);
     method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
     field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
     field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
@@ -33492,7 +33493,6 @@ package android.telephony {
     method public boolean isWorldPhone();
     method public void listen(android.telephony.PhoneStateListener, int);
     method public boolean needsOtaServiceProvisioning();
-    method public void notifyCarrierNetworkChange(boolean);
     method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
     method public void setDataEnabled(boolean);
     method public void setDataEnabled(int, boolean);

core/java/android/service/carrier/CarrierService.java

@@ -14,10 +14,15 @@
 
 package android.service.carrier;
 
+import android.annotation.CallSuper;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.PersistableBundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+
+import com.android.internal.telephony.ITelephonyRegistry;
 
 /**
  * A service that exposes carrier-specific functionality to the system.
@@ -45,10 +50,16 @@ public abstract class CarrierService extends Service {
     public static final String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
     public static final String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
 
+    private static ITelephonyRegistry sRegistry;
+
     private final ICarrierService.Stub mStubWrapper;
 
     public CarrierService() {
         mStubWrapper = new ICarrierServiceWrapper();
+        if (sRegistry == null) {
+            sRegistry = ITelephonyRegistry.Stub.asInterface(
+                    ServiceManager.getService("telephony.registry"));
+        }
     }
 
     /**
@@ -83,9 +94,39 @@ public abstract class CarrierService extends Service {
      */
     public abstract PersistableBundle onLoadConfig(CarrierIdentifier id);
 
-    /** @hide */
+    /**
+     * Informs the system of an intentional upcoming carrier network change by
+     * a carrier app. This call is optional and is only used to allow the
+     * system to provide alternative UI while telephony is performing an action
+     * that may result in intentional, temporary network lack of connectivity.
+     * <p>
+     * Based on the active parameter passed in, this method will either show or
+     * hide the alternative UI. There is no timeout associated with showing
+     * this UX, so a carrier app must be sure to call with active set to false
+     * sometime after calling with it set to true.
+     * <p>
+     * Requires Permission:
+     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
+     * Or the calling app has carrier privileges.
+     *   @see {@link android.telephony.TelephonyManager#hasCarrierPrivileges}
+     *
+     * @param active Whether the carrier network change is or shortly will be
+     *               active. Set this value to true to begin showing
+     *               alternative UI and false to stop.
+     */
+    public final void notifyCarrierNetworkChange(boolean active) {
+        try {
+            if (sRegistry != null) sRegistry.notifyCarrierNetworkChange(active);
+        } catch (RemoteException | NullPointerException ex) {}
+    }
+
+    /**
+     * If overriding this method, call through to the super method for any unknown actions.
+     * {@inheritDoc}
+     */
     @Override
-    public final IBinder onBind(Intent intent) {
+    @CallSuper
+    public IBinder onBind(Intent intent) {
         switch (intent.getAction()) {
             case CONFIG_SERVICE_INTERFACE:
             case BIND_SERVICE_INTERFACE:
@@ -98,11 +139,8 @@ public abstract class CarrierService extends Service {
     /**
      * A wrapper around ICarrierService that forwards calls to implementations of
      * {@link CarrierService}.
-     *
-     * @hide
      */
     private class ICarrierServiceWrapper extends ICarrierService.Stub {
-
         @Override
         public PersistableBundle getCarrierConfig(CarrierIdentifier id) {
             return CarrierService.this.onLoadConfig(id);

services/core/java/com/android/server/TelephonyRegistry.java

@@ -842,9 +842,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
 
     @Override
     public void notifyCarrierNetworkChange(boolean active) {
-        if (!checkNotifyPermissionOrCarrierPrivilege("notifyCarrierNetworkChange()")) {
+        enforceNotifyPermissionOrCarrierPrivilege("notifyCarrierNetworkChange()");
-            return;
+
-        }
         if (VDBG) {
             log("notifyCarrierNetworkChange: active=" + active);
         }
@@ -1511,15 +1510,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                 android.Manifest.permission.READ_PRECISE_PHONE_STATE);
     }
 
-    private boolean checkNotifyPermissionOrCarrierPrivilege(String method) {
+    private void enforceNotifyPermissionOrCarrierPrivilege(String method) {
-        if  (checkNotifyPermission() || checkCarrierPrivilege()) {
+        if  (checkNotifyPermission()) {
-            return true;
+            return;
         }
 
-        String msg = "Modify Phone State or Carrier Privilege Permission Denial: " + method
+        enforceCarrierPrivilege();
-                + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid();
-        if (DBG) log(msg);
-        return false;
     }
 
     private boolean checkNotifyPermission(String method) {
@@ -1537,17 +1533,20 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                 == PackageManager.PERMISSION_GRANTED;
     }
 
-    private boolean checkCarrierPrivilege() {
+    private void enforceCarrierPrivilege() {
         TelephonyManager tm = TelephonyManager.getDefault();
         String[] pkgs = mContext.getPackageManager().getPackagesForUid(Binder.getCallingUid());
         for (String pkg : pkgs) {
             if (tm.checkCarrierPrivilegesForPackage(pkg) ==
                     TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
-                return true;
+                return;
             }
         }
 
-        return false;
+        String msg = "Carrier Privilege Permission Denial: from pid=" + Binder.getCallingPid()
+                + ", uid=" + Binder.getCallingUid();
+        if (DBG) log(msg);
+        throw new SecurityException(msg);
     }
 
     private void checkListenerPermission(int events) {

telephony/java/android/telephony/TelephonyManager.java

@@ -2081,35 +2081,6 @@ public class TelephonyManager {
         return false;
     }
 
-    /**
-     * Informs the system of an intentional upcoming carrier network change by
-     * a carrier app. This call is optional and is only used to allow the
-     * system to provide alternative UI while telephony is performing an action
-     * that may result in intentional, temporary network lack of connectivity.
-     * <p>
-     * Based on the active parameter passed in, this method will either show or
-     * hide the alternative UI. There is no timeout associated with showing
-     * this UX, so a carrier app must be sure to call with active set to false
-     * sometime after calling with it set to true.
-     * <p>
-     * Requires Permission:
-     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
-     * Or the calling app has carrier privileges.
-     *   @see #hasCarrierPrivileges
-     *
-     * @param active Whether the carrier network change is or shortly will be
-     *               active. Set this value to true to begin showing
-     *               alternative UI and false to stop.
-     */
-    public void notifyCarrierNetworkChange(boolean active) {
-        try {
-            if (sRegistry != null)
-                sRegistry.notifyCarrierNetworkChange(active);
-        } catch (RemoteException ex) {
-        } catch (NullPointerException ex) {
-        }
-    }
-
     /**
      * Returns the alphabetic identifier associated with the line 1 number.
      * Return null if it is unavailable.