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

Merge "Different hidden API enforcement policy for P & pre-P." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-10 13:07:41 +00:00
committed by Android (Google) Code Review
parent ae664babe0 1ab3025cc7
commit 9139bbfa9b
4 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -26,6 +26,7 @@ import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Environment;
import android.os.Parcel;
import android.os.Parcelable;
@@ -1166,7 +1167,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
@Retention(RetentionPolicy.SOURCE)
public @interface HiddenApiEnforcementPolicy {}
private boolean isValidHiddenApiEnforcementPolicy(int policy) {
/** @hide */
public static boolean isValidHiddenApiEnforcementPolicy(int policy) {
return policy >= HIDDEN_API_ENFORCEMENT_DEFAULT && policy <= HIDDEN_API_ENFORCEMENT_MAX;
}
@@ -1686,13 +1688,17 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* @hide
*/
public @HiddenApiEnforcementPolicy int getHiddenApiEnforcementPolicy() {
if (mHiddenApiPolicy != HIDDEN_API_ENFORCEMENT_DEFAULT) {
return mHiddenApiPolicy;
}
if (isAllowedToUseHiddenApis()) {
return HIDDEN_API_ENFORCEMENT_NONE;
}
return HIDDEN_API_ENFORCEMENT_BLACK;
if (mHiddenApiPolicy != HIDDEN_API_ENFORCEMENT_DEFAULT) {
return mHiddenApiPolicy;
}
if (targetSdkVersion <= Build.VERSION_CODES.O_MR1) {
return HIDDEN_API_ENFORCEMENT_BLACK;
} else {
return HIDDEN_API_ENFORCEMENT_DARK_GREY_AND_BLACK;
}
}
/**
@@ -1705,6 +1711,31 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
mHiddenApiPolicy = policy;
}
/**
* Updates the hidden API enforcement policy for this app from the given values, if appropriate.
*
* This will have no effect if this app is not subject to hidden API enforcement, i.e. if it
* is on the package whitelist.
*
* @param policyPreP configured policy for pre-P apps, or {@link
* #HIDDEN_API_ENFORCEMENT_DEFAULT} if nothing configured.
* @param policyP configured policy for apps targeting P or later, or {@link
* #HIDDEN_API_ENFORCEMENT_DEFAULT} if nothing configured.
* @hide
*/
public void maybeUpdateHiddenApiEnforcementPolicy(
@HiddenApiEnforcementPolicy int policyPreP, @HiddenApiEnforcementPolicy int policyP) {
if (isPackageWhitelistedForHiddenApis()) {
return;
}
if (targetSdkVersion <= Build.VERSION_CODES.O_MR1) {
setHiddenApiEnforcementPolicy(policyPreP);
} else if (targetSdkVersion > Build.VERSION_CODES.O_MR1) {
setHiddenApiEnforcementPolicy(policyP);
}
}
/**
* @hide
*/

23
core/java/android/provider/Settings.java
View File

@@ -11748,6 +11748,29 @@ public final class Settings {
public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS =
"hidden_api_blacklist_exemptions";
/**
* Hidden API enforcement policy for apps targeting SDK versions prior to the latest
* version.
*
* Values correspond to @{@link
* android.content.pm.ApplicationInfo.HiddenApiEnforcementPolicy}
*
* @hide
*/
public static final String HIDDEN_API_POLICY_PRE_P_APPS =
"hidden_api_policy_pre_p_apps";
/**
* Hidden API enforcement policy for apps targeting the current SDK version.
*
* Values correspond to @{@link
* android.content.pm.ApplicationInfo.HiddenApiEnforcementPolicy}
*
* @hide
*/
public static final String HIDDEN_API_POLICY_P_APPS =
"hidden_api_policy_p_apps";
/**
* Timeout for a single {@link android.media.soundtrigger.SoundTriggerDetectionService}
* operation (in ms).

2
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -246,6 +246,8 @@ public class SettingsBackupTest {
Settings.Global.HDMI_CONTROL_ENABLED,
Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED,
Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
Settings.Global.HIDDEN_API_POLICY_P_APPS,
Settings.Global.HIDDEN_API_POLICY_PRE_P_APPS,
Settings.Global.HIDE_ERROR_DIALOGS,
Settings.Global.HTTP_PROXY,
HYBRID_SYSUI_BATTERY_WARNING_FLAGS,

45
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -52,6 +52,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
import static android.content.pm.ApplicationInfo.HIDDEN_API_ENFORCEMENT_DEFAULT;
import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
import static android.content.pm.PackageManager.FEATURE_LEANBACK_ONLY;
@@ -1957,7 +1958,7 @@ public class ActivityManagerService extends IActivityManager.Stub
final ActivityManagerConstants mConstants;
// Encapsulates the global setting "hidden_api_blacklist_exemptions"
final HiddenApiBlacklist mHiddenApiBlacklist;
final HiddenApiSettings mHiddenApiBlacklist;
PackageManagerInternal mPackageManagerInt;
@@ -2892,17 +2893,19 @@ public class ActivityManagerService extends IActivityManager.Stub
}
/**
* Encapsulates the global setting "hidden_api_blacklist_exemptions", including tracking the
* latest value via a content observer.
* Encapsulates global settings related to hidden API enforcement behaviour, including tracking
* the latest value via a content observer.
*/
static class HiddenApiBlacklist extends ContentObserver {
static class HiddenApiSettings extends ContentObserver {
private final Context mContext;
private boolean mBlacklistDisabled;
private String mExemptionsStr;
private List<String> mExemptions = Collections.emptyList();
@HiddenApiEnforcementPolicy private int mPolicyPreP = HIDDEN_API_ENFORCEMENT_DEFAULT;
@HiddenApiEnforcementPolicy private int mPolicyP = HIDDEN_API_ENFORCEMENT_DEFAULT;
public HiddenApiBlacklist(Handler handler, Context context) {
public HiddenApiSettings(Handler handler, Context context) {
super(handler);
mContext = context;
}
@@ -2912,6 +2915,14 @@ public class ActivityManagerService extends IActivityManager.Stub
Settings.Global.getUriFor(Settings.Global.HIDDEN_API_BLACKLIST_EXEMPTIONS),
false,
this);
mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(Settings.Global.HIDDEN_API_POLICY_PRE_P_APPS),
false,
this);
mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(Settings.Global.HIDDEN_API_POLICY_P_APPS),
false,
this);
update();
}
@@ -2931,13 +2942,32 @@ public class ActivityManagerService extends IActivityManager.Stub
}
zygoteProcess.setApiBlacklistExemptions(mExemptions);
}
mPolicyPreP = getValidEnforcementPolicy(Settings.Global.HIDDEN_API_POLICY_PRE_P_APPS);
mPolicyP = getValidEnforcementPolicy(Settings.Global.HIDDEN_API_POLICY_P_APPS);
}
private @HiddenApiEnforcementPolicy int getValidEnforcementPolicy(String settingsKey) {
int policy = Settings.Global.getInt(mContext.getContentResolver(), settingsKey,
ApplicationInfo.HIDDEN_API_ENFORCEMENT_DEFAULT);
if (ApplicationInfo.isValidHiddenApiEnforcementPolicy(policy)) {
return policy;
} else {
return ApplicationInfo.HIDDEN_API_ENFORCEMENT_DEFAULT;
}
}
boolean isDisabled() {
return mBlacklistDisabled;
}
@HiddenApiEnforcementPolicy int getPolicyForPrePApps() {
return mPolicyPreP;
}
@HiddenApiEnforcementPolicy int getPolicyForPApps() {
return mPolicyP;
}
public void onChange(boolean selfChange) {
update();
}
@@ -3110,7 +3140,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
};
mHiddenApiBlacklist = new HiddenApiBlacklist(mHandler, mContext);
mHiddenApiBlacklist = new HiddenApiSettings(mHandler, mContext);
Watchdog.getInstance().addMonitor(this);
Watchdog.getInstance().addThread(mHandler);
@@ -4226,6 +4256,9 @@ public class ActivityManagerService extends IActivityManager.Stub
}
if (!disableHiddenApiChecks && !mHiddenApiBlacklist.isDisabled()) {
app.info.maybeUpdateHiddenApiEnforcementPolicy(
mHiddenApiBlacklist.getPolicyForPrePApps(),
mHiddenApiBlacklist.getPolicyForPApps());
@HiddenApiEnforcementPolicy int policy =
app.info.getHiddenApiEnforcementPolicy();
int policyBits = (policy << Zygote.API_ENFORCEMENT_POLICY_SHIFT);