commit 8ed3fb9b8e998b226b3efdc82b76904781080221
author Philip P. Moltmann <moltmann@google.com> Sat Mar 23 23:14:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 23 23:14:16 2019 +0000
tree 1fb5fff0caec15839229cdcd9b890136a39280b0
parent b9646e70175d972b41cf14be9b0705b90149b006
parent 6f9045cd39451feb6f817544ef93cd07523d7eb6

Merge "Do not remove location permissions on Q-beta OTAs"

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c17b6c8..73b000e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2450,7 +2450,9 @@
             mIsPreNUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N;
 
             mIsPreNMR1Upgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N_MR1;
-            mIsPreQUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.Q;
+            mIsPreQUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.Q
+                    // STOPSHIP: Remove next line when API level for Q is defined.
+                    && Build.VERSION.SDK_INT > Build.VERSION_CODES.P;
 
             int preUpgradeSdkVersion = ver.sdkVersion;