am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog (ef54ab61) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -953,11 +953,6 @@
	<activity android:name="Settings$HighPowerApplicationsActivity"		<activity android:name="Settings$HighPowerApplicationsActivity"
	android:label="@string/high_power_apps"		android:label="@string/high_power_apps"
	android:taskAffinity="">		android:taskAffinity="">
	<intent-filter android:priority="1">
	<action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
	<category android:name="android.intent.category.DEFAULT" />
	<data android:scheme="package" />
	</intent-filter>
	<intent-filter android:priority="1">		<intent-filter android:priority="1">
	<action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />		<action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
	<category android:name="android.intent.category.DEFAULT" />		<category android:name="android.intent.category.DEFAULT" />
	@@ -968,6 +963,17 @@
	android:value="true" />		android:value="true" />
	</activity>		</activity>

			<activity android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
			android:label="@string/high_power_apps"
			android:taskAffinity=""
			android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
			<intent-filter android:priority="1">
			<action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
			<category android:name="android.intent.category.DEFAULT" />
			<data android:scheme="package" />
			</intent-filter>
			</activity>

	<!-- Keep compatibility with old shortcuts. -->		<!-- Keep compatibility with old shortcuts. -->
	<activity-alias android:name=".applications.ManageApplications"		<activity-alias android:name=".applications.ManageApplications"
	android:label="@string/applications_settings"		android:label="@string/applications_settings"

src/com/android/settings/applications/ManageApplications.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -258,16 +258,6 @@ public class ManageApplications extends InstrumentedFragment
	mListType = LIST_TYPE_HIGH_POWER;		mListType = LIST_TYPE_HIGH_POWER;
	// Default to showing system.		// Default to showing system.
	mShowSystem = true;		mShowSystem = true;
	if (Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS.equals(intent.getAction())
	&& intent.getData() != null) {
	mCurrentPkgName = intent.getData().getSchemeSpecificPart();
	if (mCurrentPkgName != null) {
	mCurrentUid = mApplicationsState.getEntry(mCurrentPkgName,
	UserHandle.myUserId()).info.uid;
	mFinishAfterDialog = true;
	startApplicationDetailsActivity();
	}
	}
	} else if (className.equals(OverlaySettingsActivity.class.getName())) {		} else if (className.equals(OverlaySettingsActivity.class.getName())) {
	mListType = LIST_TYPE_OVERLAY;		mListType = LIST_TYPE_OVERLAY;
	getActivity().getActionBar().setTitle(R.string.system_alert_window_access_title);		getActivity().getActionBar().setTitle(R.string.system_alert_window_access_title);

src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java

0 → 100644

+116 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2015 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.fuelgauge;

			import android.Manifest;
			import android.content.DialogInterface;
			import android.content.pm.ApplicationInfo;
			import android.content.pm.PackageManager;
			import android.os.IDeviceIdleController;
			import android.os.PowerManager;
			import android.os.RemoteException;
			import android.os.ServiceManager;
			import com.android.settings.R;

			import android.net.Uri;
			import android.os.Bundle;
			import android.util.Log;
			import com.android.internal.app.AlertActivity;
			import com.android.internal.app.AlertController;

			public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
			DialogInterface.OnClickListener {
			static final String TAG = "RequestIgnoreBatteryOptimizations";

			private static final String DEVICE_IDLE_SERVICE = "deviceidle";

			IDeviceIdleController mDeviceIdleService;
			String mPackageName;

			@Override
			public void onCreate(Bundle savedInstanceState) {
			super.onCreate(savedInstanceState);

			mDeviceIdleService = IDeviceIdleController.Stub.asInterface(
			ServiceManager.getService(DEVICE_IDLE_SERVICE));

			Uri data = getIntent().getData();
			if (data == null) {
			Log.w(TAG, "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
			+ getIntent());
			finish();
			return;
			}
			mPackageName = data.getSchemeSpecificPart();
			if (mPackageName == null) {
			Log.w(TAG, "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
			+ getIntent());
			finish();
			return;
			}

			PowerManager power = getSystemService(PowerManager.class);
			if (power.isIgnoringBatteryOptimizations(mPackageName)) {
			Log.i(TAG, "Not should prompt, already ignoring optimizations: " + mPackageName);
			finish();
			return;
			}

			ApplicationInfo ai;
			try {
			ai = getPackageManager().getApplicationInfo(mPackageName, 0);
			} catch (PackageManager.NameNotFoundException e) {
			Log.w(TAG, "Requested package doesn't exist: " + mPackageName);
			finish();
			return;
			}

			if (getPackageManager().checkPermission(
			Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, mPackageName)
			!= PackageManager.PERMISSION_GRANTED) {
			Log.w(TAG, "Requested package " + mPackageName + " does not hold permission "
			+ Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
			finish();
			return;
			}

			final AlertController.AlertParams p = mAlertParams;
			p.mTitle = getText(R.string.high_power_prompt_title);
			p.mMessage = getString(R.string.high_power_prompt_body, ai.loadLabel(getPackageManager()));
			p.mPositiveButtonText = getText(R.string.yes);
			p.mNegativeButtonText = getText(R.string.no);
			p.mPositiveButtonListener = this;
			p.mNegativeButtonListener = this;
			setupAlert();
			}

			@Override
			public void onClick(DialogInterface dialog, int which) {
			switch (which) {
			case BUTTON_POSITIVE:
			try {
			mDeviceIdleService.addPowerSaveWhitelistApp(mPackageName);
			} catch (RemoteException e) {
			Log.w(TAG, "Unable to reach IDeviceIdleController", e);
			}
			setResult(RESULT_OK);
			break;
			case BUTTON_NEGATIVE:
			break;
			}
			}
			}