commit 57064b0d46e4926ed503ac1d0c80c152bc4f853e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 22 21:48:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 21:48:55 2017 +0000
tree a7c09a31b2357500fbb85df6051043d22766de86
parent dbbebbc3fe548679b6a2c4811b1a9c389f516f0b
parent 892fc8d06789bb624b757a2cad64babab8657eb4

Merge "Do not check targetSdkVersion if only one package"

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index df292ad..01fc8ec 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3697,11 +3697,11 @@
         if (ArrayUtils.isEmpty(packageNames)) {
             return null;
         }
-        // For app op checks related to permissions all packages in the UID
-        // have the same app op state, so doesn't matter which one we pick.
-        // Update: due to visibility changes we want to use package with oldest target SDK,
-
         String packageName = packageNames[0];
+        if (packageNames.length == 1) {
+            return packageName;
+        }
+        // Due to visibility changes we want to use package with oldest target SDK
         int oldestVersion = Integer.MAX_VALUE;
         for (String name : packageNames) {
             try {