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

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

App ops: vibration, neighboring cells, dialing, etc. 

Improve handling of vibration op, so that apps are
better blamed (there is now a hidden vibrator API that
supplies the app to blame, and the system now uses this
when vibrating on behalf of an app).

Add operation for retrieving neighboring cell information.

Add a new op for calling a phone number.  This required
plumbing information about the launching package name through
the activity manager, which required changing the internal
startActivity class, which required hitting a ton of code that
uses those internal APIs.

Change-Id: I3f8015634fdb296558f07fe654fb8d53e5c94d07
parent 7a4ecc95

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

+2 −2
Original line number Diff line number Diff line
@@ -488,11 +488,11 @@ public class Am { 
            IActivityManager.WaitResult result = null;

            int res;

            if (mWaitOption) {

                result = mAm.startActivityAndWait(null, intent, mimeType,

                result = mAm.startActivityAndWait(null, null, intent, mimeType,

                            null, null, 0, mStartFlags, mProfileFile, fd, null, mUserId);

                res = result.result;

            } else {

                res = mAm.startActivityAsUser(null, intent, mimeType,

                res = mAm.startActivityAsUser(null, null, intent, mimeType,

                        null, null, 0, mStartFlags, mProfileFile, fd, null, mUserId);

            }

            PrintStream out = mWaitOption ? System.out : System.err;

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -3740,7 +3740,7 @@ public class Activity extends ContextThemeWrapper 
            try {

                intent.setAllowFds(false);

                result = ActivityManagerNative.getDefault()

                    .startActivity(mMainThread.getApplicationThread(),

                    .startActivity(mMainThread.getApplicationThread(), getBasePackageName(),

                            intent, intent.resolveTypeIfNeeded(getContentResolver()),

                            mToken, mEmbeddedID, requestCode,

                            ActivityManager.START_FLAG_ONLY_IF_NEEDED, null, null,

core/java/android/app/ActivityManagerNative.java

+44 −12
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            String callingPackage = data.readString();

            Intent intent = Intent.CREATOR.createFromParcel(data);

            String resolvedType = data.readString();

            IBinder resultTo = data.readStrongBinder();
@@ -127,7 +128,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
                    ? data.readFileDescriptor() : null;

            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int result = startActivity(app, intent, resolvedType,

            int result = startActivity(app, callingPackage, intent, resolvedType,

                    resultTo, resultWho, requestCode, startFlags,

                    profileFile, profileFd, options);

            reply.writeNoException();
@@ -140,6 +141,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            String callingPackage = data.readString();

            Intent intent = Intent.CREATOR.createFromParcel(data);

            String resolvedType = data.readString();

            IBinder resultTo = data.readStrongBinder();
@@ -152,7 +154,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();

            int result = startActivityAsUser(app, intent, resolvedType,

            int result = startActivityAsUser(app, callingPackage, intent, resolvedType,

                    resultTo, resultWho, requestCode, startFlags,

                    profileFile, profileFd, options, userId);

            reply.writeNoException();
@@ -165,6 +167,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            String callingPackage = data.readString();

            Intent intent = Intent.CREATOR.createFromParcel(data);

            String resolvedType = data.readString();

            IBinder resultTo = data.readStrongBinder();
@@ -177,7 +180,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();

            WaitResult result = startActivityAndWait(app, intent, resolvedType,

            WaitResult result = startActivityAndWait(app, callingPackage, intent, resolvedType,

                    resultTo, resultWho, requestCode, startFlags,

                    profileFile, profileFd, options, userId);

            reply.writeNoException();
@@ -190,6 +193,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            String callingPackage = data.readString();

            Intent intent = Intent.CREATOR.createFromParcel(data);

            String resolvedType = data.readString();

            IBinder resultTo = data.readStrongBinder();
@@ -200,7 +204,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();

            int result = startActivityWithConfig(app, intent, resolvedType,

            int result = startActivityWithConfig(app, callingPackage, intent, resolvedType,

                    resultTo, resultWho, requestCode, startFlags, config, options, userId);

            reply.writeNoException();

            reply.writeInt(result);
@@ -1526,13 +1530,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            String callingPackage = data.readString();

            Intent[] intents = data.createTypedArray(Intent.CREATOR);

            String[] resolvedTypes = data.createStringArray();

            IBinder resultTo = data.readStrongBinder();

            Bundle options = data.readInt() != 0

                    ? Bundle.CREATOR.createFromParcel(data) : null;

            int userId = data.readInt();

            int result = startActivities(app, intents, resolvedTypes, resultTo,

            int result = startActivities(app, callingPackage, intents, resolvedTypes, resultTo,

                    options, userId);

            reply.writeNoException();

            reply.writeInt(result);
@@ -1784,6 +1789,15 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case GET_LAUNCHED_FROM_PACKAGE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            String res = getLaunchedFromPackage(token);

            reply.writeNoException();

            reply.writeString(res);

            return true;

        }



        case REGISTER_USER_SWITCH_OBSERVER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(
@@ -1873,7 +1887,7 @@ class ActivityManagerProxy implements IActivityManager 
        return mRemote;

    }



    public int startActivity(IApplicationThread caller, Intent intent,

    public int startActivity(IApplicationThread caller, String callingPackage, Intent intent,

            String resolvedType, IBinder resultTo, String resultWho, int requestCode,

            int startFlags, String profileFile,

            ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {
@@ -1881,6 +1895,7 @@ class ActivityManagerProxy implements IActivityManager 
        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);

        intent.writeToParcel(data, 0);

        data.writeString(resolvedType);

        data.writeStrongBinder(resultTo);
@@ -1908,7 +1923,7 @@ class ActivityManagerProxy implements IActivityManager 
        return result;

    }



    public int startActivityAsUser(IApplicationThread caller, Intent intent,

    public int startActivityAsUser(IApplicationThread caller, String callingPackage, Intent intent,

            String resolvedType, IBinder resultTo, String resultWho, int requestCode,

            int startFlags, String profileFile,

            ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException {
@@ -1916,6 +1931,7 @@ class ActivityManagerProxy implements IActivityManager 
        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);

        intent.writeToParcel(data, 0);

        data.writeString(resolvedType);

        data.writeStrongBinder(resultTo);
@@ -1943,14 +1959,15 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        return result;

    }

    public WaitResult startActivityAndWait(IApplicationThread caller, Intent intent,

            String resolvedType, IBinder resultTo, String resultWho,

    public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,

            Intent intent, String resolvedType, IBinder resultTo, String resultWho,

            int requestCode, int startFlags, String profileFile,

            ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);

        intent.writeToParcel(data, 0);

        data.writeString(resolvedType);

        data.writeStrongBinder(resultTo);
@@ -1978,14 +1995,15 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        return result;

    }

    public int startActivityWithConfig(IApplicationThread caller, Intent intent,

            String resolvedType, IBinder resultTo, String resultWho,

    public int startActivityWithConfig(IApplicationThread caller, String callingPackage,

            Intent intent, String resolvedType, IBinder resultTo, String resultWho,

            int requestCode, int startFlags, Configuration config,

            Bundle options, int userId) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);

        intent.writeToParcel(data, 0);

        data.writeString(resolvedType);

        data.writeStrongBinder(resultTo);
@@ -3771,13 +3789,14 @@ class ActivityManagerProxy implements IActivityManager 
        return res;

    }

    

    public int startActivities(IApplicationThread caller,

    public int startActivities(IApplicationThread caller, String callingPackage,

            Intent[] intents, String[] resolvedTypes, IBinder resultTo,

            Bundle options, int userId) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);

        data.writeTypedArray(intents, 0);

        data.writeStringArray(resolvedTypes);

        data.writeStrongBinder(resultTo);
@@ -4123,6 +4142,19 @@ class ActivityManagerProxy implements IActivityManager 
        return result;

    }



    public String getLaunchedFromPackage(IBinder activityToken) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(activityToken);

        mRemote.transact(GET_LAUNCHED_FROM_PACKAGE_TRANSACTION, data, reply, 0);

        reply.readException();

        String result = reply.readString();

        data.recycle();

        reply.recycle();

        return result;

    }



    public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

core/java/android/app/AppOpsManager.java

+70 −24
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app;



import android.Manifest;

import com.android.internal.app.IAppOpsService;



import java.util.ArrayList;
@@ -48,7 +49,40 @@ public class AppOpsManager { 
    public static final int OP_WRITE_CALENDAR = 9;

    public static final int OP_WIFI_SCAN = 10;

    public static final int OP_POST_NOTIFICATION = 11;

    public static final int OP_NEIGHBORING_CELLS = 12;

    public static final int OP_CALL_PHONE = 13;

    /** @hide */

    public static final int _NUM_OP = 14;



    /**

     * This maps each operation to the operation that serves as the

     * switch to determine whether it is allowed.  Generally this is

     * a 1:1 mapping, but for some things (like location) that have

     * multiple low-level operations being tracked that should be

     * presented to hte user as one switch then this can be used to

     * make them all controlled by the same single operation.

     */

    private static int[] sOpToSwitch = new int[] {

            OP_COARSE_LOCATION,

            OP_COARSE_LOCATION,

            OP_COARSE_LOCATION,

            OP_VIBRATE,

            OP_READ_CONTACTS,

            OP_WRITE_CONTACTS,

            OP_READ_CALL_LOG,

            OP_WRITE_CALL_LOG,

            OP_READ_CALENDAR,

            OP_WRITE_CALENDAR,

            OP_COARSE_LOCATION,

            OP_POST_NOTIFICATION,

            OP_COARSE_LOCATION,

            OP_CALL_PHONE,

    };



    /**

     * This provides a simple name for each operation to be used

     * in debug output.

     */

    private static String[] sOpNames = new String[] {

            "COARSE_LOCATION",

            "FINE_LOCATION",
@@ -62,12 +96,18 @@ public class AppOpsManager { 
            "WRITE_CALENDAR",

            "WIFI_SCAN",

            "POST_NOTIFICATION",

            "NEIGHBORING_CELLS",

            "CALL_PHONE",

    };



    /**

     * This optionally maps a permission to an operation.  If there

     * is no permission associated with an operation, it is null.

     */

    private static String[] sOpPerms = new String[] {

            android.Manifest.permission.ACCESS_COARSE_LOCATION,

            android.Manifest.permission.ACCESS_FINE_LOCATION,

        android.Manifest.permission.ACCESS_FINE_LOCATION,

            null,

            android.Manifest.permission.VIBRATE,

            android.Manifest.permission.READ_CONTACTS,

            android.Manifest.permission.WRITE_CONTACTS,
@@ -75,10 +115,16 @@ public class AppOpsManager { 
            android.Manifest.permission.WRITE_CALL_LOG,

            android.Manifest.permission.READ_CALENDAR,

            android.Manifest.permission.WRITE_CALENDAR,

        android.Manifest.permission.ACCESS_WIFI_STATE,

            null, // no permission required for notifications

            android.Manifest.permission.ACCESS_WIFI_STATE,

            null, // neighboring cells shares the coarse location perm

            android.Manifest.permission.CALL_PHONE,

    };



    public static int opToSwitch(int op) {

        return sOpToSwitch[op];

    }



    public static String opToName(int op) {

        return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")");

    }

core/java/android/app/ContextImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ class ContextImpl extends Context { 
    public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {

        try {

            ActivityManagerNative.getDefault().startActivityAsUser(

                mMainThread.getApplicationThread(), intent,

                mMainThread.getApplicationThread(), getBasePackageName(), intent,

                intent.resolveTypeIfNeeded(getContentResolver()),

                null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, null, options,

                user.getIdentifier());