diff options
author | Matthew Fritze <mfritze@google.com> | 2018-08-16 17:33:01 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-16 17:33:01 -0700 |
commit | e48cf70a966a3bd8f62e2293b867227c3f540c61 (patch) | |
tree | 2d43726cd44648c40557e74c058230b1c92cda98 /AndroidManifest.xml | |
parent | 611d8241106faee749b3bea5ee97ccb9628917b9 (diff) | |
parent | 041bfbd2b69e68ec9e8b17f730fb9f55e471d7c3 (diff) | |
download | packages_apps_Settings-e48cf70a966a3bd8f62e2293b867227c3f540c61.tar.gz packages_apps_Settings-e48cf70a966a3bd8f62e2293b867227c3f540c61.tar.bz2 packages_apps_Settings-e48cf70a966a3bd8f62e2293b867227c3f540c61.zip |
Merge "Hide SettingsSlice provider" into pi-dev
am: 041bfbd2b6
Change-Id: I9e9f0cfc71a6352f7adfa3072a097dd126f38a29
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4e6a25edb1..f3323ed989 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3314,10 +3314,15 @@ </provider> <receiver - android:name=".slices.SliceBroadcastReceiver" > - <intent-filter> - <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/> - </intent-filter> + android:name=".slices.SliceBroadcastReceiver" + android:exported="false"> + </receiver> + + <receiver + android:name=".slices.SliceRelayReceiver" + android:permission="android.permission.MANAGE_SLICE_PERMISSIONS" + android:exported="true"> + </receiver> <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send |