diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-05-15 21:55:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 21:55:57 +0000 |
| commit | 2177ed407b8323e6f50d2aa64a62fbdc773e1859 (patch) | |
| tree | 13c94e7b2f138e0f6e23bbb2f673d966b5bc989e /packages/Shell | |
| parent | 038959e851603500eb39b52fef33cbe75dbd73e3 (diff) | |
| parent | 4c099d0c49c8366efd3c26854465b3ceef49b627 (diff) | |
| download | frameworks_base-2177ed407b8323e6f50d2aa64a62fbdc773e1859.zip frameworks_base-2177ed407b8323e6f50d2aa64a62fbdc773e1859.tar.gz frameworks_base-2177ed407b8323e6f50d2aa64a62fbdc773e1859.tar.bz2 | |
Merge changes from topic 'bench' into mnc-dev
* changes:
Command to change force adoptable state.
Initial pass at storage benchmarks.
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index dda9358..fd0ba73 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -95,6 +95,8 @@ <uses-permission android:name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/> <uses-permission android:name="android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS" /> <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" /> + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> + <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" /> <application android:label="@string/app_label"> <provider |