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

Merge "Make OP_LEGACY_STORAGE stickiness configurable" into rvc-dev am: d60a2bd945 am: adbe3f3e3e am: 9a77740c3a

Browse Source 
Change-Id: Id1b515bb7c15d83e29eeed85bd2e31ae49e9cd3a
This commit is contained in:
TreeHugger Robot
2020-03-25 21:58:13 +00:00
committed by Automerger Merge Worker
parent 6d85bae084 9a77740c3a
commit 637b7b06a7
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/storage/StorageManager.java
View File

@@ -162,7 +162,12 @@ public class StorageManager {
/** {@hide} */
public static final String PROP_SETTINGS_FUSE = FeatureFlagUtils.PERSIST_PREFIX
+ FeatureFlagUtils.SETTINGS_FUSE_FLAG;
/**
* Property that determines whether {@link OP_LEGACY_STORAGE} is sticky for
* legacy apps.
* @hide
*/
public static final String PROP_LEGACY_OP_STICKY = "persist.sys.legacy_storage_sticky";
/** {@hide} */
public static final String UUID_PRIVATE_INTERNAL = null;

9
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -43,6 +43,7 @@ import static android.os.storage.OnObbStateChangeListener.ERROR_PERMISSION_DENIE
import static android.os.storage.OnObbStateChangeListener.MOUNTED;
import static android.os.storage.OnObbStateChangeListener.UNMOUNTED;
import static android.os.storage.StorageManager.PROP_FUSE;
import static android.os.storage.StorageManager.PROP_LEGACY_OP_STICKY;
import static android.os.storage.StorageManager.PROP_SETTINGS_FUSE;
import static com.android.internal.util.XmlUtils.readIntAttribute;
@@ -903,6 +904,7 @@ class StorageManagerService extends IStorageManager.Stub
refreshIsolatedStorageSettings();
}
});
updateLegacyStorageOpSticky();
// For now, simply clone property when it changes
DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
mContext.getMainExecutor(), (properties) -> {
@@ -1779,6 +1781,13 @@ class StorageManagerService extends IStorageManager.Stub
}
}
private void updateLegacyStorageOpSticky() {
final boolean propertyValue = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
"legacy_storage_op_sticky", true);
SystemProperties.set(PROP_LEGACY_OP_STICKY, propertyValue ? "true" : "false");
}
private void start() {
connectStoraged();
connectVold();

12
services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
View File

@@ -26,6 +26,7 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INST
import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT;
import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.storage.StorageManager.PROP_LEGACY_OP_STICKY;
import static java.lang.Integer.min;
@@ -36,6 +37,7 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.storage.StorageManagerInternal;
@@ -63,6 +65,9 @@ public abstract class SoftRestrictedPermissionPolicy {
}
};
private static final boolean isLegacyStorageAppOpStickyGlobal = SystemProperties.getBoolean(
PROP_LEGACY_OP_STICKY, /*defaultValue*/true);
/**
* TargetSDK is per package. To make sure two apps int the same shared UID do not fight over
* what to set, always compute the combined targetSDK.
@@ -136,9 +141,12 @@ public abstract class SoftRestrictedPermissionPolicy {
shouldPreserveLegacyExternalStorage = pkg.hasPreserveLegacyExternalStorage()
&& smInternal.hasLegacyExternalStorage(appInfo.uid);
targetSDK = getMinimumTargetSDK(context, appInfo, user);
// LEGACY_STORAGE op is normally sticky for apps targetig <= Q.
// However, this device can be configured to make it non-sticky.
boolean isLegacyAppOpSticky = isLegacyStorageAppOpStickyGlobal
&& targetSDK <= Build.VERSION_CODES.Q;
shouldApplyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0
|| (targetSDK > Build.VERSION_CODES.Q
&& !shouldPreserveLegacyExternalStorage);
|| (!isLegacyAppOpSticky && !shouldPreserveLegacyExternalStorage);
} else {
isWhiteListed = false;
shouldApplyRestriction = false;