summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2018-04-18 09:44:14 -0700
committer android-build-merger <android-build-merger@google.com> 2018-04-18 09:44:14 -0700
commit86e2a2ab32910dd1fc805440f6565cd95598adf9 (patch)
tree1362996d63bc44b362cfc20949f44047e977ba8e
parentcb877aae0e98a4672626f0bcdbfd56e5647d3cf5 (diff)
parent84208c724e2c33fed3957e4f193101428ad46b38 (diff)
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
am: 84208c724e Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d
-rw-r--r--core/java/android/app/slice/SliceManager.java2
-rw-r--r--packages/SystemUI/AndroidManifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java
index 28e59383f5b1..22df6c03aee2 100644
--- a/core/java/android/app/slice/SliceManager.java
+++ b/core/java/android/app/slice/SliceManager.java
@@ -66,7 +66,7 @@ public class SliceManager {
* @hide
*/
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.
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 285b89f9c8a2..b5407dc0fd3a 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -455,7 +455,7 @@
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true">
<intent-filter>
- <action android:name="android.intent.action.REQUEST_SLICE_PERMISSION" />
+ <action android:name="com.android.intent.action.REQUEST_SLICE_PERMISSION" />
</intent-filter>
</activity>