summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAnna Trostanetski <atrost@google.com>2019-10-22 13:20:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-22 13:20:59 -0700
commit4cfb3545d60a857042a643cc3143f7958ca9aced (patch)
treeba3b5779b955c6603dbd9e4f8446166e4f5498fd /core/java
parent06792d7c5c805369264ebfbc1c1a73893e8ceb21 (diff)
parent577e3114da0684f3f5eeecb77ec4f0e95ff5b0c1 (diff)
Merge "Add a native aidl API."
am: 577e3114da Change-Id: I22c7963991747fe1e27dce432da3fc02c644bbef
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/Context.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a6b95a95dcd8..51bb85a7fe8e 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -74,6 +74,7 @@ import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;
import android.view.textclassifier.TextClassificationManager;
import com.android.internal.compat.IPlatformCompat;
+import com.android.internal.compat.IPlatformCompatNative;
import java.io.File;
import java.io.FileInputStream;
@@ -3231,6 +3232,7 @@ public abstract class Context {
//@hide ROLE_CONTROLLER_SERVICE,
CAMERA_SERVICE,
//@hide: PLATFORM_COMPAT_SERVICE,
+ //@hide: PLATFORM_COMPAT_NATIVE_SERVICE,
PRINT_SERVICE,
CONSUMER_IR_SERVICE,
//@hide: TRUST_SERVICE,
@@ -4596,6 +4598,14 @@ public abstract class Context {
public static final String PLATFORM_COMPAT_SERVICE = "platform_compat";
/**
+ * Use with {@link android.os.ServiceManager.getService()} to retrieve a
+ * {@link IPlatformCompatNative} IBinder for native code communicating with the platform compat
+ * service.
+ * @hide
+ */
+ public static final String PLATFORM_COMPAT_NATIVE_SERVICE = "platform_compat_native";
+
+ /**
* Service to capture a bugreport.
* @see #getSystemService(String)
* @see android.os.BugreportManager