Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-05 03:49:24 +00:00
committed by Android (Google) Code Review
parent eafb535072 898468657e
commit 30a0f96250
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Shell/AndroidManifest.xml
View File

@@ -114,6 +114,8 @@
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) --> <!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) -->
<uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" /> <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
<!-- Permission needed to hold a wakelock in dumpstate.cpp (drop_root_user()) -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"