Merge "Revert "User consent for Logcat data access""

2 files changed, 0 insertions, 10 deletions

diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index a58ceaa99022..cce7dd338b3d 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -215,14 +215,6 @@ public abstract class ActivityManagerInternal {
     public abstract boolean isSystemReady();
 
     /**
-     * Returns package name given pid.
-     *
-     * @param pid The pid we are searching package name for.
-     */
-    @Nullable
-    public abstract String getPackageNameByPid(int pid);
-
-    /**
      * Sets if the given pid has an overlay UI or not.
      *
      * @param pid The pid we are setting overlay UI for.
diff --git a/core/java/android/os/logcat/ILogcatManagerService.aidl b/core/java/android/os/logcat/ILogcatManagerService.aidl
index 02db2749bbe8..68b5679919d6 100644
--- a/core/java/android/os/logcat/ILogcatManagerService.aidl
+++ b/core/java/android/os/logcat/ILogcatManagerService.aidl
@@ -22,7 +22,5 @@ package android.os.logcat;
 interface ILogcatManagerService {
     void startThread(in int uid, in int gid, in int pid, in int fd);
     void finishThread(in int uid, in int gid, in int pid, in int fd);
-    void approve(in int uid, in int gid, in int pid, in int fd);
-    void decline(in int uid, in int gid, in int pid, in int fd);
 }