Merge "Clean-up device flag for persisting appwidget provider info" (4f51bbe2) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -551,12 +551,6 @@ public final class SystemUiDeviceConfigFlags {
		public static final String TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP =
		"task_manager_inform_job_scheduler_of_pending_app_stop";

		/**
		* (boolean) Whether widget provider info would be saved to / loaded from system persistence
		* layer as opposed to individual manifests in respective apps.
		*/
		public static final String PERSISTS_WIDGET_PROVIDER_INFO = "persists_widget_provider_info";

		/**
		* (boolean) Whether to show smart chips (based on TextClassifier) in the clipboard overlay.
		*/

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+5 −34

Original line number	Diff line number	Diff line
		@@ -158,7 +158,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		private static final String TAG = "AppWidgetServiceImpl";

		private static final boolean DEBUG = false;
		static final boolean DEBUG_PROVIDER_INFO_CACHE = true;

		private static final String OLD_KEYGUARD_HOST_PACKAGE = "android";
		private static final String NEW_KEYGUARD_HOST_PACKAGE = "com.android.keyguard";
		@@ -255,7 +254,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku

		private boolean mSafeMode;
		private int mMaxWidgetBitmapMemory;
		private boolean mIsProviderInfoPersisted;
		private boolean mIsCombinedBroadcastEnabled;

		// Mark widget lifecycle broadcasts as 'interactive'
		@@ -281,14 +279,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		mCallbackHandler = new CallbackHandler(serviceThread.getLooper());
		mBackupRestoreController = new BackupRestoreController();
		mSecurityPolicy = new SecurityPolicy();
		mIsProviderInfoPersisted = !ActivityManager.isLowRamDeviceStatic()
		&& DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.PERSISTS_WIDGET_PROVIDER_INFO, true);
		mIsCombinedBroadcastEnabled = DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.COMBINED_BROADCAST_ENABLED, true);
		if (DEBUG_PROVIDER_INFO_CACHE && !mIsProviderInfoPersisted) {
		Slog.d(TAG, "App widget provider info will not be persisted on this device");
		}

		BroadcastOptions opts = BroadcastOptions.makeBasic();
		opts.setBackgroundActivityStartsAllowed(false);
		@@ -2528,21 +2520,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		}
		}

		private static void serializeProvider(
		@NonNull final TypedXmlSerializer out, @NonNull final Provider p) throws IOException {
		Objects.requireNonNull(out);
		Objects.requireNonNull(p);
		serializeProviderInner(out, p, false /* persistsProviderInfo */);
		}

		private static void serializeProviderWithProviderInfo(
		@NonNull final TypedXmlSerializer out, @NonNull final Provider p) throws IOException {
		Objects.requireNonNull(out);
		Objects.requireNonNull(p);
		serializeProviderInner(out, p, true /* persistsProviderInfo */);
		}

		private static void serializeProviderInner(@NonNull final TypedXmlSerializer out,
		private static void serializeProvider(@NonNull final TypedXmlSerializer out,
		@NonNull final Provider p, final boolean persistsProviderInfo) throws IOException {
		Objects.requireNonNull(out);
		Objects.requireNonNull(p);
		@@ -2553,9 +2531,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		if (!TextUtils.isEmpty(p.infoTag)) {
		out.attribute(null, "info_tag", p.infoTag);
		}
		if (DEBUG_PROVIDER_INFO_CACHE && persistsProviderInfo && !p.mInfoParsed) {
		Slog.d(TAG, "Provider info from " + p.id.componentName + " won't be persisted.");
		}
		if (persistsProviderInfo && p.mInfoParsed) {
		AppWidgetXmlUtil.writeAppWidgetProviderInfoLocked(out, p.info);
		}
		@@ -3172,11 +3147,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		if (provider.getUserId() != userId) {
		continue;
		}
		if (mIsProviderInfoPersisted) {
		serializeProviderWithProviderInfo(out, provider);
		} else if (provider.shouldBePersisted()) {
		serializeProvider(out, provider);
		}
		serializeProvider(out, provider, true /* persistsProviderInfo */);
		}

		N = mHosts.size();
		@@ -3274,10 +3245,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		provider.zombie = true;
		provider.id = providerId;
		mProviders.add(provider);
		} else if (mIsProviderInfoPersisted) {
		} else {
		final AppWidgetProviderInfo info =
		AppWidgetXmlUtil.readAppWidgetProviderInfoLocked(parser);
		if (DEBUG_PROVIDER_INFO_CACHE && info == null) {
		if (DEBUG && info == null) {
		Slog.d(TAG, "Unable to load widget provider info from xml for "
		+ providerId.componentName);
		}
		@@ -4601,7 +4572,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		&& (provider.isInPackageForUser(backedupPackage, userId)
		\|\| provider.hostedByPackageForUser(backedupPackage, userId))) {
		provider.tag = index;
		serializeProvider(out, provider);
		serializeProvider(out, provider, false /* persistsProviderInfo*/);
		index++;
		}
		}

services/appwidget/java/com/android/server/appwidget/AppWidgetXmlUtil.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.appwidget.AppWidgetProviderInfo;
		import android.content.ComponentName;
		import android.os.Build;
		import android.text.TextUtils;
		import android.util.Slog;

		import com.android.modules.utils.TypedXmlPullParser;
		import com.android.modules.utils.TypedXmlSerializer;
		@@ -84,8 +83,6 @@ public class AppWidgetXmlUtil {
		}
		if (info.label != null) {
		out.attribute(null, ATTR_LABEL, info.label);
		} else if (AppWidgetServiceImpl.DEBUG_PROVIDER_INFO_CACHE) {
		Slog.e(TAG, "Label is empty in " + info.provider);
		}
		out.attributeInt(null, ATTR_ICON, info.icon);
		out.attributeInt(null, ATTR_PREVIEW_IMAGE, info.previewImage);