提交: 6a89d1107b56327580292bad227b3aeaa65dbb8b - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: 6a89d1107b56327580292bad227b3aeaa65dbb8b (tree)
• 时间: 2020-04-29 03:45:07
• 作者: Anis Assi <anisassi@goog...>
• Commiter: Anis Assi

Log Message

Revert "DO NOT MERGE - Kill apps outright for API contract violations"

This reverts commit c6fd63a7a80f06a89b34aa1894694922c3af9f20.

更改概述

• modified: core/java/android/app/IActivityManager.aidl
• modified: services/core/java/com/android/server/am/ActiveServices.java
• modified: services/core/java/com/android/server/am/ActivityManagerService.java
• modified: services/core/java/com/android/server/am/ActivityManagerShellCommand.java
• modified: services/core/java/com/android/server/am/AppErrors.java
• modified: services/core/java/com/android/server/am/ServiceRecord.java
• modified: services/core/java/com/android/server/notification/NotificationManagerService.java

差异

--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -266,8 +266,7 @@ interface IActivityManager {
     boolean isImmersive(in IBinder token);
     void setImmersive(in IBinder token, boolean immersive);
     boolean isTopActivityImmersive();
-    void crashApplication(int uid, int initialPid, in String packageName, int userId,
-            in String message, boolean force);
+    void crashApplication(int uid, int initialPid, in String packageName, int userId, in String message);
     String getProviderMimeType(in Uri uri, int userId);
     IBinder newUriPermissionOwner(in String name);
     void grantUriPermissionFromOwner(in IBinder owner, int fromUid, in String targetPkg,

--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -653,15 +653,6 @@ public final class ActiveServices {
         }
     }
 
-    void killMisbehavingService(ServiceRecord r,
-            int appUid, int appPid, String localPackageName) {
-        synchronized (mAm) {
-            stopServiceLocked(r);
-            mAm.crashApplication(appUid, appPid, localPackageName, -1,
-                    "Bad notification for startForeground", true /*force*/);
-        }
-    }
-
     IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {
         ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, callingPackage,
                 Binder.getCallingPid(), Binder.getCallingUid(),
@@ -3400,8 +3391,7 @@ public final class ActiveServices {
 
     void serviceForegroundCrash(ProcessRecord app) {
         mAm.crashApplication(app.uid, app.pid, app.info.packageName, app.userId,
-                "Context.startForegroundService() did not then call Service.startForeground()",
-                false /*force*/);
+                "Context.startForegroundService() did not then call Service.startForeground()");
     }
 
     void scheduleServiceTimeoutLocked(ProcessRecord proc) {

--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5141,7 +5141,7 @@ public class ActivityManagerService extends IActivityManager.Stub
 
     @Override
     public void crashApplication(int uid, int initialPid, String packageName, int userId,
-            String message, boolean force) {
+            String message) {
         if (checkCallingPermission(android.Manifest.permission.FORCE_STOP_PACKAGES)
                 != PackageManager.PERMISSION_GRANTED) {
             String msg = "Permission Denial: crashApplication() from pid="
@@ -5153,8 +5153,7 @@ public class ActivityManagerService extends IActivityManager.Stub
         }
 
         synchronized(this) {
-            mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName, userId,
-                    message, force);
+            mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName, userId, message);
         }
     }
 

--- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@ -921,7 +921,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
         } catch (NumberFormatException e) {
             packageName = arg;
         }
-        mInterface.crashApplication(-1, pid, packageName, userId, "shell-induced crash", false);
+        mInterface.crashApplication(-1, pid, packageName, userId, "shell-induced crash");
         return 0;
     }
 

--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -243,24 +243,20 @@ class AppErrors {
     }
 
     void killAppAtUserRequestLocked(ProcessRecord app, Dialog fromDialog) {
+        app.crashing = false;
+        app.crashingReport = null;
+        app.notResponding = false;
+        app.notRespondingReport = null;
         if (app.anrDialog == fromDialog) {
             app.anrDialog = null;
         }
         if (app.waitDialog == fromDialog) {
             app.waitDialog = null;
         }
-        killAppImmediateLocked(app, "user-terminated", "user request after error");
-    }
-
-    private void killAppImmediateLocked(ProcessRecord app, String reason, String killReason) {
-        app.crashing = false;
-        app.crashingReport = null;
-        app.notResponding = false;
-        app.notRespondingReport = null;
         if (app.pid > 0 && app.pid != MY_PID) {
-            handleAppCrashLocked(app, reason,
+            handleAppCrashLocked(app, "user-terminated" /*reason*/,
                     null /*shortMsg*/, null /*longMsg*/, null /*stackTrace*/, null /*data*/);
-            app.kill(killReason, true);
+            app.kill("user request after error", true);
         }
     }
 
@@ -274,7 +270,7 @@ class AppErrors {
      * @param message
      */
     void scheduleAppCrashLocked(int uid, int initialPid, String packageName, int userId,
-            String message, boolean force) {
+            String message) {
         ProcessRecord proc = null;
 
         // Figure out which process to kill.  We don't trust that initialPid
@@ -307,14 +303,6 @@ class AppErrors {
         }
 
         proc.scheduleCrash(message);
-        if (force) {
-            // If the app is responsive, the scheduled crash will happen as expected
-            // and then the delayed summary kill will be a no-op.
-            final ProcessRecord p = proc;
-            mService.mHandler.postDelayed(
-                    () -> killAppImmediateLocked(p, "forced", "killed for invalid state"),
-                    5000L);
-        }
     }
 
     /**

--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -453,7 +453,6 @@ final class ServiceRecord extends Binder {
             final String localPackageName = packageName;
             final int localForegroundId = foregroundId;
             final Notification _foregroundNoti = foregroundNoti;
-            final ServiceRecord record = this;
             ams.mHandler.post(new Runnable() {
                 public void run() {
                     NotificationManagerInternal nm = LocalServices.getService(
@@ -552,8 +551,10 @@ final class ServiceRecord extends Binder {
                         Slog.w(TAG, "Error showing notification for service", e);
                         // If it gave us a garbage notification, it doesn't
                         // get to be foreground.
-                        ams.mServices.killMisbehavingService(record,
-                                appUid, appPid, localPackageName);
+                        ams.setServiceForeground(name, ServiceRecord.this,
+                                0, null, 0);
+                        ams.crashApplication(appUid, appPid, localPackageName, -1,
+                                "Bad notification for startForeground: " + e);
                     }
                 }
             });

--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -714,23 +714,18 @@ public class NotificationManagerService extends SystemService {
         @Override
         public void onNotificationError(int callingUid, int callingPid, String pkg, String tag, int id,
                 int uid, int initialPid, String message, int userId) {
-            final boolean fgService;
-            synchronized (mNotificationLock) {
-                NotificationRecord r = findNotificationLocked(pkg, tag, id, userId);
-                fgService = r != null
-                        && (r.getNotification().flags&Notification.FLAG_FOREGROUND_SERVICE) != 0;
-            }
+            Slog.d(TAG, "onNotification error pkg=" + pkg + " tag=" + tag + " id=" + id
+                    + "; will crashApplication(uid=" + uid + ", pid=" + initialPid + ")");
             cancelNotification(callingUid, callingPid, pkg, tag, id, 0, 0, false, userId,
                     REASON_ERROR, null);
-            if (fgService) {
-                // Still crash for foreground services, preventing the not-crash behaviour abused
-                // by apps to give us a garbage notification and silently start a fg service.
-                Binder.withCleanCallingIdentity(
-                        () -> mAm.crashApplication(uid, initialPid, pkg, -1,
-                            "Bad notification(tag=" + tag + ", id=" + id + ") posted from package "
-                                + pkg + ", crashing app(uid=" + uid + ", pid=" + initialPid + "): "
-                                + message, true /* force */));
+            long ident = Binder.clearCallingIdentity();
+            try {
+                ActivityManager.getService().crashApplication(uid, initialPid, pkg, -1,
+                        "Bad notification posted from package " + pkg
+                        + ": " + message);
+            } catch (RemoteException e) {
             }
+            Binder.restoreCallingIdentity(ident);
         }
 
         @Override