summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2019-11-17 14:31:04 +0200
committerMichael Bestas <mkbestas@lineageos.org>2019-11-17 14:34:10 +0200
commit79b51ecbdeef70f94d6fbe1fb19aa1fea47b51de (patch)
treeecc84349e218866284d08994472163cbeba24335
parent90572ee3eb7730d87f84e80dce0ce6e56347751a (diff)
downloadandroid_frameworks_base-79b51ecbdeef70f94d6fbe1fb19aa1fea47b51de.tar.gz
android_frameworks_base-79b51ecbdeef70f94d6fbe1fb19aa1fea47b51de.tar.bz2
android_frameworks_base-79b51ecbdeef70f94d6fbe1fb19aa1fea47b51de.zip
Fix ADB root system API extension
* Fixes checkapi: out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/current-apicheck/srcjars/android/Manifest.java:3435: error: Added field android.Manifest.permission.ADBROOT to the system API [AddedField] error: Added package android.adb to the system API [AddedPackage] Change-Id: Idd509c31d961a0b20fac8cccd2c83c6bf23c5a38
-rw-r--r--core/java/android/adb/ADBRootService.java1
-rw-r--r--core/res/AndroidManifest.xml3
2 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/adb/ADBRootService.java b/core/java/android/adb/ADBRootService.java
index cfd29d0ad13..aeb5fb5238d 100644
--- a/core/java/android/adb/ADBRootService.java
+++ b/core/java/android/adb/ADBRootService.java
@@ -25,7 +25,6 @@ import android.os.ServiceManager;
/**
* {@hide}
*/
-@SystemApi
public class ADBRootService {
private static final String TAG = "ADBRootService";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 25848dceae3..c1005aec7b4 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -4609,13 +4609,12 @@
<permission android:name="android.permission.PREVENT_POWER_KEY"
android:protectionLevel="signature|privileged" />
- <!-- @SystemApi Allows an application to manage ADB Root
+ <!-- Allows an application to manage ADB Root
@hide <p>Not for use by third-party applications.
-->
<permission android:name="android.permission.ADBROOT"
android:protectionLevel="signature|privileged" />
-
<application android:process="system"
android:persistent="true"
android:hasCode="false"