diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-05-15 22:08:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-15 22:08:51 +0000 |
| commit | e12fe8cd98341f79487843b1e35113e7577298a2 (patch) | |
| tree | 1faf553716481d083939102c039ca3715ec20135 /packages/Shell | |
| parent | 10595666e441952c5ab7fa1d7f9b4e8f7d25d200 (diff) | |
| parent | 2177ed407b8323e6f50d2aa64a62fbdc773e1859 (diff) | |
| download | frameworks_base-e12fe8cd98341f79487843b1e35113e7577298a2.zip frameworks_base-e12fe8cd98341f79487843b1e35113e7577298a2.tar.gz frameworks_base-e12fe8cd98341f79487843b1e35113e7577298a2.tar.bz2 | |
am 2177ed40: Merge changes from topic \'bench\' into mnc-dev
* commit '2177ed407b8323e6f50d2aa64a62fbdc773e1859':
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 |