commit f228b8b69e962064126ba053f6d776c3623b85a4
author Neil Fuller <nfuller@google.com> Mon Jan 06 13:02:41 2020 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 06 13:02:41 2020 -0800
tree 12262ac041c6f2f69ced4f0f71781b08c85e9b9c
parent adb90684b5cac8d0cd6539b3eeec23ebb7a51bfa
parent 4e6d6174bd0904801a40015185f8bbaa94404a54

Merge "Track permission changes in frameworks/base"
am: 4e6d6174bd

Change-Id: I6b0eb7e706eee65c868fb2cfe1c84189bf8f8432

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d11cf6..8e1e587 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -130,8 +130,8 @@
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.SEND_RESPOND_VIA_MESSAGE" />
-    <uses-permission android:name="android.permission.SET_TIME" />
     <uses-permission android:name="android.permission.SET_TIME_ZONE" />
+    <uses-permission android:name="android.permission.SUGGEST_PHONE_TIME_AND_ZONE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />