Merge cherrypicks of [3035013, 3035015, 3035020, 3035060] into oc-m2-release (367d98ad) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ public abstract class ActivityManagerInternal {
		/**
		* Allow DeviceIdleController to tell us about what apps are whitelisted.
		*/
		public abstract void setDeviceIdleWhitelist(int[] appids);
		public abstract void setDeviceIdleWhitelist(int[] userAppids, int[] allAppids);

		/**
		* Update information about which app IDs are on the temp whitelist.

core/java/android/app/ActivityThread.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.content.Context;
		import android.content.IContentProvider;
		import android.content.IIntentReceiver;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		@@ -75,6 +76,7 @@ import android.os.MessageQueue;
		import android.os.Parcel;
		import android.os.ParcelFileDescriptor;
		import android.os.PersistableBundle;
		import android.os.PowerManager;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		@@ -5772,6 +5774,18 @@ public final class ActivityThread {
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		IntentFilter filter = new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

		if (app != null) {
		app.registerReceiver(
		new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		ThreadedRenderer.setFPSDivisor(context, 1);

		}
		}, filter);
		}
		}

		/package/ final void finishInstrumentation(int resultCode, Bundle results) {

core/java/android/app/AppOpsManager.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -252,8 +252,10 @@ public class AppOpsManager {
		public static final int OP_INSTANT_APP_START_FOREGROUND = 68;
		/** @hide Answer incoming phone calls */
		public static final int OP_ANSWER_PHONE_CALLS = 69;
		/** @hide Run jobs when in background */
		public static final int OP_RUN_ANY_IN_BACKGROUND = 70;
		/** @hide */
		public static final int _NUM_OP = 70;
		public static final int _NUM_OP = 71;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -492,7 +494,8 @@ public class AppOpsManager {
		OP_REQUEST_INSTALL_PACKAGES,
		OP_PICTURE_IN_PICTURE,
		OP_INSTANT_APP_START_FOREGROUND,
		OP_ANSWER_PHONE_CALLS
		OP_ANSWER_PHONE_CALLS,
		OP_RUN_ANY_IN_BACKGROUND,
		};

		/**
		@@ -570,6 +573,7 @@ public class AppOpsManager {
		OPSTR_PICTURE_IN_PICTURE,
		OPSTR_INSTANT_APP_START_FOREGROUND,
		OPSTR_ANSWER_PHONE_CALLS,
		null, // OP_RUN_ANY_IN_BACKGROUND
		};

		/**
		@@ -647,6 +651,7 @@ public class AppOpsManager {
		"PICTURE_IN_PICTURE",
		"INSTANT_APP_START_FOREGROUND",
		"ANSWER_PHONE_CALLS",
		"RUN_ANY_IN_BACKGROUND",
		};

		/**
		@@ -724,6 +729,7 @@ public class AppOpsManager {
		null, // no permission for entering picture-in-picture on hide
		Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,
		Manifest.permission.ANSWER_PHONE_CALLS,
		null, // no permission for OP_RUN_ANY_IN_BACKGROUND
		};

		/**
		@@ -802,6 +808,7 @@ public class AppOpsManager {
		null, // ENTER_PICTURE_IN_PICTURE_ON_HIDE
		null, // INSTANT_APP_START_FOREGROUND
		null, // ANSWER_PHONE_CALLS
		null, // OP_RUN_ANY_IN_BACKGROUND
		};

		/**
		@@ -879,6 +886,7 @@ public class AppOpsManager {
		false, // ENTER_PICTURE_IN_PICTURE_ON_HIDE
		false, // INSTANT_APP_START_FOREGROUND
		false, // ANSWER_PHONE_CALLS
		false, // OP_RUN_ANY_IN_BACKGROUND
		};

		/**
		@@ -955,6 +963,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // OP_PICTURE_IN_PICTURE
		AppOpsManager.MODE_DEFAULT, // OP_INSTANT_APP_START_FOREGROUND
		AppOpsManager.MODE_ALLOWED, // ANSWER_PHONE_CALLS
		AppOpsManager.MODE_ALLOWED, // OP_RUN_ANY_IN_BACKGROUND
		};

		/**
		@@ -1035,6 +1044,7 @@ public class AppOpsManager {
		false, // OP_PICTURE_IN_PICTURE
		false,
		false, // ANSWER_PHONE_CALLS
		false, // OP_RUN_ANY_IN_BACKGROUND
		};

		/**

core/java/android/app/IActivityManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,7 @@ interface IActivityManager {
		int getLaunchedFromUid(in IBinder activityToken);
		void unstableProviderDied(in IBinder connection);
		boolean isIntentSenderAnActivity(in IIntentSender sender);
		boolean isIntentSenderAForegroundService(in IIntentSender sender);
		int startActivityAsUser(in IApplicationThread caller, in String callingPackage,
		in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho,
		int requestCode, int flags, in ProfilerInfo profilerInfo,

core/java/android/app/LoadedApk.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.IIntentReceiver;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.ServiceConnection;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;