From 1ae81a547eff28641f7a7d1237be2bbda2daea6f Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Tue, 21 May 2019 15:31:36 -0700 Subject: Mark perm DB version as -1 when upgrading from P So that we can implement different behavior between Android P and Q. Test: Upgraded P->Q and booted fresh install of Q. Checked DB after boot Bug: 131427665 Change-Id: I89f9dc1fc11129c95c03834e21628c6be75f2875 --- core/java/android/permission/PermissionManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/java') diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index 2a41c2065c46..e15659db90a8 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -68,7 +68,8 @@ public final class PermissionManager { /** * Gets the version of the runtime permission database. * - * @return The database version. + * @return The database version, -1 when this is an upgrade from pre-Q, 0 when this is a fresh + * install. * * @hide */ -- cgit v1.2.3