Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f51f6126 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

App ops: new operations for SMS. 

Implementation required a new framework feature
to associate an app op with a broadcast.

Change-Id: I4ff41a52f7ad4ee8fd80cbf7b394f04d6c4315b3
parent b8614791

cmds/am/src/com/android/commands/am/Am.java

+2 −2
Original line number Diff line number Diff line
@@ -614,8 +614,8 @@ public class Am { 
        Intent intent = makeIntent(UserHandle.USER_ALL);

        IntentReceiver receiver = new IntentReceiver();

        System.out.println("Broadcasting: " + intent);

        mAm.broadcastIntent(null, intent, null, receiver, 0, null, null, null, true, false,

                mUserId);

        mAm.broadcastIntent(null, intent, null, receiver, 0, null, null, null,

                android.app.AppOpsManager.OP_NONE, true, false, mUserId);

        receiver.waitForFinish();

    }

core/java/android/app/ActivityManagerNative.java

+5 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
        try {

            getDefault().broadcastIntent(

                null, intent, null, null, Activity.RESULT_OK, null, null,

                null /*permission*/, false, true, userId);

                null /*permission*/, AppOpsManager.OP_NONE, false, true, userId);

        } catch (RemoteException ex) {

        }

    }
@@ -344,11 +344,12 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            String resultData = data.readString();

            Bundle resultExtras = data.readBundle();

            String perm = data.readString();

            int appOp = data.readInt();

            boolean serialized = data.readInt() != 0;

            boolean sticky = data.readInt() != 0;

            int userId = data.readInt();

            int res = broadcastIntent(app, intent, resolvedType, resultTo,

                    resultCode, resultData, resultExtras, perm,

                    resultCode, resultData, resultExtras, perm, appOp,

                    serialized, sticky, userId);

            reply.writeNoException();

            reply.writeInt(res);
@@ -2174,7 +2175,7 @@ class ActivityManagerProxy implements IActivityManager 
    public int broadcastIntent(IApplicationThread caller,

            Intent intent, String resolvedType,  IIntentReceiver resultTo,

            int resultCode, String resultData, Bundle map,

            String requiredPermission, boolean serialized,

            String requiredPermission, int appOp, boolean serialized,

            boolean sticky, int userId) throws RemoteException

    {

        Parcel data = Parcel.obtain();
@@ -2188,6 +2189,7 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeString(resultData);

        data.writeBundle(map);

        data.writeString(requiredPermission);

        data.writeInt(appOp);

        data.writeInt(serialized ? 1 : 0);

        data.writeInt(sticky ? 1 : 0);

        data.writeInt(userId);

core/java/android/app/AppOpsManager.java

+38 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class AppOpsManager { 
    public static final int MODE_IGNORED = 1;

    public static final int MODE_ERRORED = 2;



    public static final int OP_NONE = -1;

    public static final int OP_COARSE_LOCATION = 0;

    public static final int OP_FINE_LOCATION = 1;

    public static final int OP_GPS = 2;
@@ -51,8 +52,17 @@ public class AppOpsManager { 
    public static final int OP_POST_NOTIFICATION = 11;

    public static final int OP_NEIGHBORING_CELLS = 12;

    public static final int OP_CALL_PHONE = 13;

    public static final int OP_READ_SMS = 14;

    public static final int OP_WRITE_SMS = 15;

    public static final int OP_RECEIVE_SMS = 16;

    public static final int OP_RECEIVE_EMERGECY_SMS = 17;

    public static final int OP_RECEIVE_MMS = 18;

    public static final int OP_RECEIVE_WAP_PUSH = 19;

    public static final int OP_SEND_SMS = 20;

    public static final int OP_READ_ICC_SMS = 21;

    public static final int OP_WRITE_ICC_SMS = 22;

    /** @hide */

    public static final int _NUM_OP = 14;

    public static final int _NUM_OP = 23;



    /**

     * This maps each operation to the operation that serves as the
@@ -77,6 +87,15 @@ public class AppOpsManager { 
            OP_POST_NOTIFICATION,

            OP_COARSE_LOCATION,

            OP_CALL_PHONE,

            OP_READ_SMS,

            OP_WRITE_SMS,

            OP_READ_SMS,

            OP_READ_SMS,

            OP_READ_SMS,

            OP_READ_SMS,

            OP_WRITE_SMS,

            OP_READ_SMS,

            OP_WRITE_SMS,

    };



    /**
@@ -98,6 +117,15 @@ public class AppOpsManager { 
            "POST_NOTIFICATION",

            "NEIGHBORING_CELLS",

            "CALL_PHONE",

            "READ_SMS",

            "WRITE_SMS",

            "RECEIVE_SMS",

            "RECEIVE_EMERGECY_SMS",

            "RECEIVE_MMS",

            "RECEIVE_WAP_PUSH",

            "SEND_SMS",

            "READ_ICC_SMS",

            "WRITE_ICC_SMS",

    };



    /**
@@ -119,6 +147,15 @@ public class AppOpsManager { 
            android.Manifest.permission.ACCESS_WIFI_STATE,

            null, // neighboring cells shares the coarse location perm

            android.Manifest.permission.CALL_PHONE,

            android.Manifest.permission.READ_SMS,

            android.Manifest.permission.WRITE_SMS,

            android.Manifest.permission.RECEIVE_SMS,

            android.Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,

            android.Manifest.permission.RECEIVE_MMS,

            android.Manifest.permission.RECEIVE_WAP_PUSH,

            android.Manifest.permission.SEND_SMS,

            android.Manifest.permission.READ_SMS,

            android.Manifest.permission.WRITE_SMS,

    };



    public static int opToSwitch(int op) {

core/java/android/app/ContextImpl.java

+36 −13
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, false, false,

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, false,

                getUserId());

        } catch (RemoteException e) {

        }
@@ -1056,7 +1056,21 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, false, false,

                Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE,

                false, false, getUserId());

        } catch (RemoteException e) {

        }

    }



    @Override

    public void sendBroadcast(Intent intent, String receiverPermission, int appOp) {

        warnIfCallingFromSystemProcess();

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, appOp, false, false,

                getUserId());

        } catch (RemoteException e) {

        }
@@ -1071,7 +1085,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, true, false,

                Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE, true, false,

                getUserId());

        } catch (RemoteException e) {

        }
@@ -1082,6 +1096,15 @@ class ContextImpl extends Context { 
            String receiverPermission, BroadcastReceiver resultReceiver,

            Handler scheduler, int initialCode, String initialData,

            Bundle initialExtras) {

        sendOrderedBroadcast(intent, receiverPermission, AppOpsManager.OP_NONE,

                resultReceiver, scheduler, initialCode, initialData, initialExtras);

    }



    @Override

    public void sendOrderedBroadcast(Intent intent,

            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            Handler scheduler, int initialCode, String initialData,

            Bundle initialExtras) {

        warnIfCallingFromSystemProcess();

        IIntentReceiver rd = null;

        if (resultReceiver != null) {
@@ -1105,7 +1128,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, receiverPermission,

                initialCode, initialData, initialExtras, receiverPermission, appOp,

                    true, false, getUserId());

        } catch (RemoteException e) {

        }
@@ -1117,8 +1140,8 @@ class ContextImpl extends Context { 
        try {

            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(mMainThread.getApplicationThread(),

                    intent, resolvedType, null, Activity.RESULT_OK, null, null, null, false, false,

                    user.getIdentifier());

                    intent, resolvedType, null, Activity.RESULT_OK, null, null, null,

                    AppOpsManager.OP_NONE, false, false, user.getIdentifier());

        } catch (RemoteException e) {

        }

    }
@@ -1131,7 +1154,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, receiverPermission, false, false,

                Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE, false, false,

                user.getIdentifier());

        } catch (RemoteException e) {

        }
@@ -1164,7 +1187,7 @@ class ContextImpl extends Context { 
            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, receiverPermission,

                true, false, user.getIdentifier());

                    AppOpsManager.OP_NONE, true, false, user.getIdentifier());

        } catch (RemoteException e) {

        }

    }
@@ -1177,7 +1200,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, false, true,

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, true,

                getUserId());

        } catch (RemoteException e) {

        }
@@ -1212,7 +1235,7 @@ class ContextImpl extends Context { 
            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, null,

                true, true, getUserId());

                    AppOpsManager.OP_NONE, true, true, getUserId());

        } catch (RemoteException e) {

        }

    }
@@ -1239,7 +1262,7 @@ class ContextImpl extends Context { 
            intent.setAllowFds(false);

            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, false, true, user.getIdentifier());

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, true, user.getIdentifier());

        } catch (RemoteException e) {

        }

    }
@@ -1272,7 +1295,7 @@ class ContextImpl extends Context { 
            ActivityManagerNative.getDefault().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, null,

                true, true, user.getIdentifier());

                    AppOpsManager.OP_NONE, true, true, user.getIdentifier());

        } catch (RemoteException e) {

        }

    }

core/java/android/app/IActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public interface IActivityManager extends IInterface { 
    public int broadcastIntent(IApplicationThread caller, Intent intent,

            String resolvedType, IIntentReceiver resultTo, int resultCode,

            String resultData, Bundle map, String requiredPermission,

            boolean serialized, boolean sticky, int userId) throws RemoteException;

            int appOp, boolean serialized, boolean sticky, int userId) throws RemoteException;

    public void unbroadcastIntent(IApplicationThread caller, Intent intent, int userId) throws RemoteException;

    public void finishReceiver(IBinder who, int resultCode, String resultData, Bundle map, boolean abortBroadcast) throws RemoteException;

    public void attachApplication(IApplicationThread app) throws RemoteException;