diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-11 00:19:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 00:19:44 +0000 |
| commit | 5cf89a011932f1af9361e7b713e33ff5c5af3e61 (patch) | |
| tree | c30bc3ba311dadc3e421be5324d9951bdda5b7ce /tests | |
| parent | 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc (diff) | |
| parent | b2b020922fb51b88d34a6478209fc232702de318 (diff) | |
| download | frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.zip frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.tar.gz frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.tar.bz2 | |
am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
Fix issue #23037899: Support for Battery Optimization permission + Dialog
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ActivityTests/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/ActivityTests/AndroidManifest.xml b/tests/ActivityTests/AndroidManifest.xml index 73cb432..7b9c9f1 100644 --- a/tests/ActivityTests/AndroidManifest.xml +++ b/tests/ActivityTests/AndroidManifest.xml @@ -24,6 +24,7 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> + <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <uses-sdk android:targetSdkVersion="22" /> <application android:label="ActivityTest"> <activity android:name="ActivityTestMain"> diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 2f0bf39..5fbfe8a 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -465,9 +465,12 @@ public class ActivityTestMain extends Activity { menu.add("Ignore battery optimizations").setOnMenuItemClickListener( new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { - Intent intent = new Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS); + Intent intent; if (!mPower.isIgnoringBatteryOptimizations(getPackageName())) { + intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); intent.setData(Uri.fromParts("package", getPackageName(), null)); + } else { + intent = new Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS); } startActivity(intent); return true; |