Merge "Deprecate high power location broadcast" (01f6c698) · Commits · e / os / android_frameworks_base

location/java/android/location/LocationManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -260,7 +260,9 @@ public class LocationManager {
		* {@code OP_MONITOR_HIGH_POWER_LOCATION}.
		*
		* @hide
		* @deprecated This action is unnecessary from Android S forward.
		*/
		@Deprecated
		public static final String HIGH_POWER_REQUEST_CHANGE_ACTION =
		"android.location.HIGH_POWER_REQUEST_CHANGE";

packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import android.content.Context;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.UserHandle;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		@@ -57,12 +57,11 @@ public class AppOpsControllerImpl implements AppOpsController,
		private static final long NOTED_OP_TIME_DELAY_MS = 5000;
		private static final String TAG = "AppOpsControllerImpl";
		private static final boolean DEBUG = false;
		private final Context mContext;

		private final AppOpsManager mAppOps;
		private H mBGHandler;
		private final List<AppOpsController.Callback> mCallbacks = new ArrayList<>();
		private final ArrayMap<Integer, Set<Callback>> mCallbacksByCode = new ArrayMap<>();
		private final SparseArray<Set<Callback>> mCallbacksByCode = new SparseArray<>();
		private boolean mListening;

		@GuardedBy("mActiveItems")
		@@ -71,6 +70,7 @@ public class AppOpsControllerImpl implements AppOpsController,
		private final List<AppOpItem> mNotedItems = new ArrayList<>();

		protected static final int[] OPS = new int[] {
		AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION,
		AppOpsManager.OP_CAMERA,
		AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
		AppOpsManager.OP_RECORD_AUDIO,
		@@ -83,7 +83,6 @@ public class AppOpsControllerImpl implements AppOpsController,
		Context context,
		@Background Looper bgLooper,
		DumpManager dumpManager) {
		mContext = context;
		mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
		mBGHandler = new H(bgLooper);
		final int numOps = OPS.length;
		@@ -131,7 +130,7 @@ public class AppOpsControllerImpl implements AppOpsController,
		boolean added = false;
		final int numCodes = opsCodes.length;
		for (int i = 0; i < numCodes; i++) {
		if (mCallbacksByCode.containsKey(opsCodes[i])) {
		if (mCallbacksByCode.contains(opsCodes[i])) {
		mCallbacksByCode.get(opsCodes[i]).add(callback);
		added = true;
		} else {
		@@ -155,7 +154,7 @@ public class AppOpsControllerImpl implements AppOpsController,
		public void removeCallback(int[] opsCodes, AppOpsController.Callback callback) {
		final int numCodes = opsCodes.length;
		for (int i = 0; i < numCodes; i++) {
		if (mCallbacksByCode.containsKey(opsCodes[i])) {
		if (mCallbacksByCode.contains(opsCodes[i])) {
		mCallbacksByCode.get(opsCodes[i]).remove(callback);
		}
		}
		@@ -312,7 +311,7 @@ public class AppOpsControllerImpl implements AppOpsController,
		}

		private void notifySuscribers(int code, int uid, String packageName, boolean active) {
		if (mCallbacksByCode.containsKey(code)) {
		if (mCallbacksByCode.contains(code)) {
		if (DEBUG) Log.d(TAG, "Notifying of change in package " + packageName);
		for (Callback cb: mCallbacksByCode.get(code)) {
		cb.onActiveStateChanged(code, uid, packageName, active);

packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java

+28 −49

Original line number	Diff line number	Diff line
		@@ -16,11 +16,11 @@

		package com.android.systemui.statusbar.policy;

		import static android.app.AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION;

		import static com.android.settingslib.Utils.updateLocationEnabled;

		import android.app.ActivityManager;
		import android.app.AppOpsManager;
		import android.app.StatusBarManager;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		@@ -36,8 +36,9 @@ import android.provider.Settings;
		import androidx.annotation.VisibleForTesting;

		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.appops.AppOpItem;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.util.Utils;

		@@ -51,41 +52,32 @@ import javax.inject.Singleton;
		* A controller to manage changes of location related states and update the views accordingly.
		*/
		@Singleton
		public class LocationControllerImpl extends BroadcastReceiver implements LocationController {

		private static final int[] mHighPowerRequestAppOpArray
		= new int[] {AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION};
		public class LocationControllerImpl extends BroadcastReceiver implements LocationController,
		AppOpsController.Callback {

		private Context mContext;
		private final Context mContext;
		private final AppOpsController mAppOpsController;
		private final BootCompleteCache mBootCompleteCache;
		private final H mHandler;

		private AppOpsManager mAppOpsManager;
		private StatusBarManager mStatusBarManager;
		private BroadcastDispatcher mBroadcastDispatcher;
		private BootCompleteCache mBootCompleteCache;

		private boolean mAreActiveLocationRequests;

		private final H mHandler;

		@Inject
		public LocationControllerImpl(Context context, @Main Looper mainLooper,
		@Background Looper bgLooper, BroadcastDispatcher broadcastDispatcher,
		public LocationControllerImpl(Context context, AppOpsController appOpsController,
		@Main Looper mainLooper, BroadcastDispatcher broadcastDispatcher,
		BootCompleteCache bootCompleteCache) {
		mContext = context;
		mBroadcastDispatcher = broadcastDispatcher;
		mAppOpsController = appOpsController;
		mBootCompleteCache = bootCompleteCache;
		mHandler = new H(mainLooper);

		// Register to listen for changes in location settings.
		IntentFilter filter = new IntentFilter();
		filter.addAction(LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION);
		filter.addAction(LocationManager.MODE_CHANGED_ACTION);
		mBroadcastDispatcher.registerReceiverWithHandler(this, filter,
		new Handler(bgLooper), UserHandle.ALL);
		broadcastDispatcher.registerReceiverWithHandler(this, filter, mHandler, UserHandle.ALL);

		mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
		mStatusBarManager
		= (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE);
		mAppOpsController.addCallback(new int[]{OP_MONITOR_HIGH_POWER_LOCATION}, this);

		// Examine the current location state and initialize the status view.
		updateActiveLocationRequests();
		@@ -160,29 +152,14 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio
		*/
		@VisibleForTesting
		protected boolean areActiveHighPowerLocationRequests() {
		List<AppOpsManager.PackageOps> packages
		= mAppOpsManager.getPackagesForOps(mHighPowerRequestAppOpArray);
		// AppOpsManager can return null when there is no requested data.
		if (packages != null) {
		final int numPackages = packages.size();
		for (int packageInd = 0; packageInd < numPackages; packageInd++) {
		AppOpsManager.PackageOps packageOp = packages.get(packageInd);
		List<AppOpsManager.OpEntry> opEntries = packageOp.getOps();
		if (opEntries != null) {
		final int numOps = opEntries.size();
		for (int opInd = 0; opInd < numOps; opInd++) {
		AppOpsManager.OpEntry opEntry = opEntries.get(opInd);
		// AppOpsManager should only return OP_MONITOR_HIGH_POWER_LOCATION because
		// of the mHighPowerRequestAppOpArray filter, but checking defensively.
		if (opEntry.getOp() == AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION) {
		if (opEntry.isRunning()) {
		List<AppOpItem> appOpsItems = mAppOpsController.getActiveAppOps();

		final int numItems = appOpsItems.size();
		for (int i = 0; i < numItems; i++) {
		if (appOpsItems.get(i).getCode() == OP_MONITOR_HIGH_POWER_LOCATION) {
		return true;
		}
		}
		}
		}
		}
		}

		return false;
		}
		@@ -198,14 +175,16 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio

		@Override
		public void onReceive(Context context, Intent intent) {
		final String action = intent.getAction();
		if (LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)) {
		updateActiveLocationRequests();
		} else if (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
		mHandler.sendEmptyMessage(H.MSG_LOCATION_SETTINGS_CHANGED);
		if (LocationManager.MODE_CHANGED_ACTION.equals(intent.getAction())) {
		mHandler.locationSettingsChanged();
		}
		}

		@Override
		public void onActiveStateChanged(int code, int uid, String packageName, boolean active) {
		updateActiveLocationRequests();
		}

		private final class H extends Handler {
		private static final int MSG_LOCATION_SETTINGS_CHANGED = 1;
		private static final int MSG_LOCATION_ACTIVE_CHANGED = 2;

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java

+29 −8

Original line number	Diff line number	Diff line
		@@ -15,12 +15,13 @@
		package com.android.systemui.statusbar.policy;

		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.app.AppOpsManager;
		import android.content.Intent;
		import android.location.LocationManager;
		import android.testing.AndroidTestingRunner;
		@@ -31,12 +32,15 @@ import androidx.test.filters.SmallTest;

		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.statusbar.policy.LocationController.LocationChangeCallback;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@RunWith(AndroidTestingRunner.class)
		@RunWithLooper
		@@ -46,11 +50,15 @@ public class LocationControllerImplTest extends SysuiTestCase {
		private LocationControllerImpl mLocationController;
		private TestableLooper mTestableLooper;

		@Mock private AppOpsController mAppOpsController;

		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);

		mTestableLooper = TestableLooper.get(this);
		mLocationController = spy(new LocationControllerImpl(mContext,
		mTestableLooper.getLooper(),
		mAppOpsController,
		mTestableLooper.getLooper(),
		mock(BroadcastDispatcher.class),
		mock(BootCompleteCache.class)));
		@@ -67,12 +75,12 @@ public class LocationControllerImplTest extends SysuiTestCase {
		mLocationController.addCallback(callback);
		mLocationController.addCallback(mock(LocationChangeCallback.class));

		when(mLocationController.areActiveHighPowerLocationRequests()).thenReturn(false);
		mLocationController.onReceive(mContext, new Intent(
		LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION));
		when(mLocationController.areActiveHighPowerLocationRequests()).thenReturn(true);
		mLocationController.onReceive(mContext, new Intent(
		LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION));
		doReturn(false).when(mLocationController).areActiveHighPowerLocationRequests();
		mLocationController.onActiveStateChanged(AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION, 0,
		"", false);
		doReturn(true).when(mLocationController).areActiveHighPowerLocationRequests();
		mLocationController.onActiveStateChanged(AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION, 0,
		"", true);

		mTestableLooper.processAllMessages();
		}
		@@ -107,11 +115,22 @@ public class LocationControllerImplTest extends SysuiTestCase {
		LocationChangeCallback callback = mock(LocationChangeCallback.class);

		mLocationController.addCallback(callback);

		mTestableLooper.processAllMessages();

		mLocationController.onReceive(mContext, new Intent(LocationManager.MODE_CHANGED_ACTION));

		mTestableLooper.processAllMessages();

		verify(callback, times(2)).onLocationSettingsChanged(anyBoolean());

		doReturn(true).when(mLocationController).areActiveHighPowerLocationRequests();
		mLocationController.onActiveStateChanged(AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION, 0,
		"", true);

		mTestableLooper.processAllMessages();

		verify(callback, times(1)).onLocationActiveChanged(anyBoolean());
		}

		@Test
		@@ -124,6 +143,8 @@ public class LocationControllerImplTest extends SysuiTestCase {
		verify(callback).onLocationSettingsChanged(anyBoolean());
		mLocationController.removeCallback(callback);

		mTestableLooper.processAllMessages();

		mLocationController.onReceive(mContext, new Intent(LocationManager.MODE_CHANGED_ACTION));

		mTestableLooper.processAllMessages();

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -232,7 +232,6 @@ import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.graphics.Rect;
		import android.hardware.display.DisplayManagerInternal;
		import android.location.LocationManager;
		import android.media.audiofx.AudioEffect;
		import android.net.Proxy;
		import android.net.Uri;
		@@ -15863,7 +15862,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		\|\| Intent.ACTION_FACTORY_RESET.equals(action)
		\|\| AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action)
		\|\| AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)
		\|\| LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)
		\|\| TelephonyManager.ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE.equals(action)
		\|\| SuggestionSpan.ACTION_SUGGESTION_PICKED.equals(action)
		\|\| AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION.equals(action)