Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-24 05:59:44 +00:00
committed by Android (Google) Code Review
parent 58ac2ae2cb 1ae81a547e
commit da7156d13d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/permission/PermissionManager.java
View File

@@ -68,7 +68,8 @@ public final class PermissionManager {
/** /**
* Gets the version of the runtime permission database. * 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 * @hide
*/ */

7
services/core/java/com/android/server/pm/Settings.java
View File

@@ -5102,6 +5102,7 @@ public final class Settings {
private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 200; private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 200;
private static final long MAX_WRITE_PERMISSIONS_DELAY_MILLIS = 2000; private static final long MAX_WRITE_PERMISSIONS_DELAY_MILLIS = 2000;
private static final int UPGRADE_VERSION = -1;
private static final int INITIAL_VERSION = 0; private static final int INITIAL_VERSION = 0;
private final Handler mHandler = new MyHandler(); private final Handler mHandler = new MyHandler();
@@ -5133,7 +5134,7 @@ public final class Settings {
@GuardedBy("Settings.this.mLock") @GuardedBy("Settings.this.mLock")
int getVersionLPr(int userId) { int getVersionLPr(int userId) {
return mVersions.get(userId); return mVersions.get(userId, INITIAL_VERSION);
} }
@GuardedBy("Settings.this.mLock") @GuardedBy("Settings.this.mLock")
@@ -5365,8 +5366,10 @@ public final class Settings {
switch (parser.getName()) { switch (parser.getName()) {
case TAG_RUNTIME_PERMISSIONS: { case TAG_RUNTIME_PERMISSIONS: {
// If the permisions settings file exists but the version is not set this is
// an upgrade from P->Q. Hence mark it with the special UPGRADE_VERSION
int version = XmlUtils.readIntAttribute(parser, ATTR_VERSION, int version = XmlUtils.readIntAttribute(parser, ATTR_VERSION,
INITIAL_VERSION); UPGRADE_VERSION);
mVersions.put(userId, version); mVersions.put(userId, version);
String fingerprint = parser.getAttributeValue(null, ATTR_FINGERPRINT); String fingerprint = parser.getAttributeValue(null, ATTR_FINGERPRINT);
mFingerprints.put(userId, fingerprint); mFingerprints.put(userId, fingerprint);