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

Merge "Slices: Don't use public namespace for internal intent" into pi-dev

Browse Source 
am: 84208c724e

Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d
This commit is contained in:
Jason Monk
2018-04-18 09:44:14 -07:00
committed by android-build-merger
parent cb877aae0e 84208c724e
commit 86e2a2ab32
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/slice/SliceManager.java
View File

@@ -66,7 +66,7 @@ public class SliceManager {
* @hide * @hide
*/ */
public static final String ACTION_REQUEST_SLICE_PERMISSION = public static final String ACTION_REQUEST_SLICE_PERMISSION =
"android.intent.action.REQUEST_SLICE_PERMISSION"; "com.android.intent.action.REQUEST_SLICE_PERMISSION";
/** /**
* Category used to resolve intents that can be rendered as slices. * Category used to resolve intents that can be rendered as slices.

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -455,7 +455,7 @@
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.REQUEST_SLICE_PERMISSION" /> <action android:name="com.android.intent.action.REQUEST_SLICE_PERMISSION" />
</intent-filter> </intent-filter>
</activity> </activity>