Loading Android.mk +2 −63 Original line number Diff line number Diff line Loading @@ -15,67 +15,6 @@ # LOCAL_PATH := $(call my-dir) $(eval $(call declare-1p-copy-files,frameworks/base,.ogg)) $(eval $(call declare-1p-copy-files,frameworks/base,.kl)) $(eval $(call declare-1p-copy-files,frameworks/base,.kcm)) $(eval $(call declare-1p-copy-files,frameworks/base,.idc)) $(eval $(call declare-1p-copy-files,frameworks/base,dirty-image-objects)) $(eval $(call declare-1p-copy-files,frameworks/base/config,)) $(eval $(call declare-1p-copy-files,frameworks/native/data,)) # Load framework-specific path mappings used later in the build. include $(LOCAL_PATH)/pathmap.mk # Build the master framework library. # The framework contains too many method references (>64K) for poor old DEX. # So we first build the framework as a monolithic static library then split it # up into smaller pieces. # ============================================================ # embedded builds use nothing in frameworks/base ifneq ($(ANDROID_BUILD_EMBEDDED),true) # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ include $(CLEAR_VARS) # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to # $(OUT_DOCS)/offline-sdk. $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip $(hide) rm -rf $(OUT_DOCS)/offline-sdk $(hide) mkdir -p $(OUT_DOCS)/offline-sdk ( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1 .PHONY: docs offline-sdk-docs docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON) SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\ activity_actions.txt \ broadcast_actions.txt \ categories.txt \ features.txt \ service_actions.txt \ widgets.txt) SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES)) $(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES)) $(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip rm -rf $(SDK_METADATA_DIR) mkdir -p $(SDK_METADATA_DIR) unzip -DDqo $< -d $(SDK_METADATA_DIR) .PHONY: framework-doc-stubs framework-doc-stubs: $(SDK_METADATA) # Include subdirectory makefiles # ============================================================ # If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework # team really wants is to build the stuff defined by this makefile. ifeq (,$(ONE_SHOT_MAKEFILE)) # TODO: Empty this file after all subdirectories' Android.mk have been # converted to Android.bp to avoid using any newly added Android.mk. include $(call first-makefiles-under,$(LOCAL_PATH)) endif endif # ANDROID_BUILD_EMBEDDED core/java/android/app/ActivityManagerInternal.java +7 −3 Original line number Diff line number Diff line Loading @@ -1253,10 +1253,14 @@ public abstract class ActivityManagerInternal { public abstract boolean clearApplicationUserData(String packageName, boolean keepState, boolean isRestore, IPackageDataObserver observer, int userId); /** * Returns current state of {@link com.android.systemui.theme.ThemeOverlayController} color * palette readiness. * Method that checks if system is Headless (don't delay launch) case in which it * should also check if ThemeOverlayController is ready (don't delay) or not (delay). * * @param userId * @return Boolean indicating if Home launch should wait for ThemeOverlayController signal * @hide */ public abstract boolean isThemeOverlayReady(int userId); public abstract boolean shouldDelayHomeLaunch(int userId); } core/java/android/app/admin/DevicePolicyManager.java +5 −2 Original line number Diff line number Diff line Loading @@ -12749,6 +12749,10 @@ public class DevicePolicyManager { * <li>{@link android.provider.Settings.System#SCREEN_OFF_TIMEOUT}</li> * </ul> * <p> * Starting from Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, a * profile owner on an organization-owned device can call this method on the parent * {@link DevicePolicyManager} instance returned by * {@link #getParentProfileInstance(ComponentName)} to set system settings on the parent user. * * @see android.provider.Settings.System#SCREEN_OFF_TIMEOUT * @param admin Which {@link DeviceAdminReceiver} this request is associated with. Loading @@ -12758,10 +12762,9 @@ public class DevicePolicyManager { */ public void setSystemSetting(@NonNull ComponentName admin, @NonNull @SystemSettingsWhitelist String setting, String value) { throwIfParentInstance("setSystemSetting"); if (mService != null) { try { mService.setSystemSetting(admin, setting, value); mService.setSystemSetting(admin, setting, value, mParentInstance); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } core/java/android/app/admin/IDevicePolicyManager.aidl +1 −1 Original line number Diff line number Diff line Loading @@ -316,7 +316,7 @@ interface IDevicePolicyManager { int getLockTaskFeatures(in ComponentName who, String callerPackageName); void setGlobalSetting(in ComponentName who, in String setting, in String value); void setSystemSetting(in ComponentName who, in String setting, in String value); void setSystemSetting(in ComponentName who, in String setting, in String value, boolean parent); void setSecureSetting(in ComponentName who, in String setting, in String value); void setConfiguredNetworksLockdownState(in ComponentName who, String callerPackageName, boolean lockdown); Loading core/java/android/app/admin/flags/flags.aconfig +7 −0 Original line number Diff line number Diff line Loading @@ -173,3 +173,10 @@ flag { purpose: PURPOSE_BUGFIX } } flag { name: "allow_screen_brightness_control_on_cope" namespace: "enterprise" description: "Allow COPE admin to control screen brightness and timeout." bug: "323894620" } Loading
Android.mk +2 −63 Original line number Diff line number Diff line Loading @@ -15,67 +15,6 @@ # LOCAL_PATH := $(call my-dir) $(eval $(call declare-1p-copy-files,frameworks/base,.ogg)) $(eval $(call declare-1p-copy-files,frameworks/base,.kl)) $(eval $(call declare-1p-copy-files,frameworks/base,.kcm)) $(eval $(call declare-1p-copy-files,frameworks/base,.idc)) $(eval $(call declare-1p-copy-files,frameworks/base,dirty-image-objects)) $(eval $(call declare-1p-copy-files,frameworks/base/config,)) $(eval $(call declare-1p-copy-files,frameworks/native/data,)) # Load framework-specific path mappings used later in the build. include $(LOCAL_PATH)/pathmap.mk # Build the master framework library. # The framework contains too many method references (>64K) for poor old DEX. # So we first build the framework as a monolithic static library then split it # up into smaller pieces. # ============================================================ # embedded builds use nothing in frameworks/base ifneq ($(ANDROID_BUILD_EMBEDDED),true) # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ include $(CLEAR_VARS) # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to # $(OUT_DOCS)/offline-sdk. $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip $(hide) rm -rf $(OUT_DOCS)/offline-sdk $(hide) mkdir -p $(OUT_DOCS)/offline-sdk ( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1 .PHONY: docs offline-sdk-docs docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON) SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\ activity_actions.txt \ broadcast_actions.txt \ categories.txt \ features.txt \ service_actions.txt \ widgets.txt) SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES)) $(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES)) $(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip rm -rf $(SDK_METADATA_DIR) mkdir -p $(SDK_METADATA_DIR) unzip -DDqo $< -d $(SDK_METADATA_DIR) .PHONY: framework-doc-stubs framework-doc-stubs: $(SDK_METADATA) # Include subdirectory makefiles # ============================================================ # If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework # team really wants is to build the stuff defined by this makefile. ifeq (,$(ONE_SHOT_MAKEFILE)) # TODO: Empty this file after all subdirectories' Android.mk have been # converted to Android.bp to avoid using any newly added Android.mk. include $(call first-makefiles-under,$(LOCAL_PATH)) endif endif # ANDROID_BUILD_EMBEDDED
core/java/android/app/ActivityManagerInternal.java +7 −3 Original line number Diff line number Diff line Loading @@ -1253,10 +1253,14 @@ public abstract class ActivityManagerInternal { public abstract boolean clearApplicationUserData(String packageName, boolean keepState, boolean isRestore, IPackageDataObserver observer, int userId); /** * Returns current state of {@link com.android.systemui.theme.ThemeOverlayController} color * palette readiness. * Method that checks if system is Headless (don't delay launch) case in which it * should also check if ThemeOverlayController is ready (don't delay) or not (delay). * * @param userId * @return Boolean indicating if Home launch should wait for ThemeOverlayController signal * @hide */ public abstract boolean isThemeOverlayReady(int userId); public abstract boolean shouldDelayHomeLaunch(int userId); }
core/java/android/app/admin/DevicePolicyManager.java +5 −2 Original line number Diff line number Diff line Loading @@ -12749,6 +12749,10 @@ public class DevicePolicyManager { * <li>{@link android.provider.Settings.System#SCREEN_OFF_TIMEOUT}</li> * </ul> * <p> * Starting from Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, a * profile owner on an organization-owned device can call this method on the parent * {@link DevicePolicyManager} instance returned by * {@link #getParentProfileInstance(ComponentName)} to set system settings on the parent user. * * @see android.provider.Settings.System#SCREEN_OFF_TIMEOUT * @param admin Which {@link DeviceAdminReceiver} this request is associated with. Loading @@ -12758,10 +12762,9 @@ public class DevicePolicyManager { */ public void setSystemSetting(@NonNull ComponentName admin, @NonNull @SystemSettingsWhitelist String setting, String value) { throwIfParentInstance("setSystemSetting"); if (mService != null) { try { mService.setSystemSetting(admin, setting, value); mService.setSystemSetting(admin, setting, value, mParentInstance); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); }
core/java/android/app/admin/IDevicePolicyManager.aidl +1 −1 Original line number Diff line number Diff line Loading @@ -316,7 +316,7 @@ interface IDevicePolicyManager { int getLockTaskFeatures(in ComponentName who, String callerPackageName); void setGlobalSetting(in ComponentName who, in String setting, in String value); void setSystemSetting(in ComponentName who, in String setting, in String value); void setSystemSetting(in ComponentName who, in String setting, in String value, boolean parent); void setSecureSetting(in ComponentName who, in String setting, in String value); void setConfiguredNetworksLockdownState(in ComponentName who, String callerPackageName, boolean lockdown); Loading
core/java/android/app/admin/flags/flags.aconfig +7 −0 Original line number Diff line number Diff line Loading @@ -173,3 +173,10 @@ flag { purpose: PURPOSE_BUGFIX } } flag { name: "allow_screen_brightness_control_on_cope" namespace: "enterprise" description: "Allow COPE admin to control screen brightness and timeout." bug: "323894620" }