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

Merge "Add back protected profile availibility broadcasts." into nyc-dev

Browse Source 
am: cda5089

* commit 'cda50893b623f19834114eb225d78fceb70b8aca':
  Add back protected profile availibility broadcasts.

Change-Id: Ifdc256f382896797d340d7f17061188738e8962f
This commit is contained in:
Rubin Xu
2016-04-25 18:09:36 +00:00
committed by android-build-merger
parent c83cefc224 cda50893b6
commit f8a52efc8e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/AndroidManifest.xml
View File

@@ -467,6 +467,9 @@
<protected-broadcast android:name="com.android.internal.location.ALARM_TIMEOUT" />
<protected-broadcast android:name="android.intent.action.GLOBAL_BUTTON" />
<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
<!-- ====================================================================== -->
<!-- RUNTIME PERMISSIONS -->
<!-- ====================================================================== -->