Snap for 4966094 from c9443e38944b11d32f63fd87aca2e5ceb5235767 to pi-qpr1-release (44b2fa61) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -6338,6 +6338,10 @@ public class Activity extends ContextThemeWrapper
		}

		void dumpInner(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
		if (args != null && args.length > 0 && args[0].equals("--autofill")) {
		dumpAutofillManager(prefix, writer);
		return;
		}
		writer.print(prefix); writer.print("Local Activity ");
		writer.print(Integer.toHexString(System.identityHashCode(this)));
		writer.println(" State:");
		@@ -6365,16 +6369,20 @@ public class Activity extends ContextThemeWrapper

		mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);

		dumpAutofillManager(prefix, writer);

		ResourcesManager.getInstance().dump(prefix, writer);
		}

		void dumpAutofillManager(String prefix, PrintWriter writer) {
		final AutofillManager afm = getAutofillManager();
		if (afm != null) {
		afm.dump(prefix, writer);
		writer.print(prefix); writer.print("Autofill Compat Mode: ");
		writer.println(isAutofillCompatibilityEnabled());
		afm.dump(prefix, writer);
		} else {
		writer.print(prefix); writer.println("No AutofillManager");
		}

		ResourcesManager.getInstance().dump(prefix, writer);
		}

		/**

core/java/android/app/ResourcesManager.java

+35 −18

Original line number	Diff line number	Diff line
		@@ -121,10 +121,13 @@ public class ResourcesManager {
		}
		}

		private static final boolean ENABLE_APK_ASSETS_CACHE = false;

		/**
		* The ApkAssets we are caching and intend to hold strong references to.
		*/
		private final LruCache<ApkKey, ApkAssets> mLoadedApkAssets = new LruCache<>(3);
		private final LruCache<ApkKey, ApkAssets> mLoadedApkAssets =
		(ENABLE_APK_ASSETS_CACHE) ? new LruCache<>(3) : null;

		/**
		* The ApkAssets that are being referenced in the wild that we can reuse, even if they aren't
		@@ -310,17 +313,23 @@ public class ResourcesManager {
		private @NonNull ApkAssets loadApkAssets(String path, boolean sharedLib, boolean overlay)
		throws IOException {
		final ApkKey newKey = new ApkKey(path, sharedLib, overlay);
		ApkAssets apkAssets = mLoadedApkAssets.get(newKey);
		ApkAssets apkAssets = null;
		if (mLoadedApkAssets != null) {
		apkAssets = mLoadedApkAssets.get(newKey);
		if (apkAssets != null) {
		return apkAssets;
		}
		}

		// Optimistically check if this ApkAssets exists somewhere else.
		final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.get(newKey);
		if (apkAssetsRef != null) {
		apkAssets = apkAssetsRef.get();
		if (apkAssets != null) {
		if (mLoadedApkAssets != null) {
		mLoadedApkAssets.put(newKey, apkAssets);
		}

		return apkAssets;
		} else {
		// Clean up the reference.
		@@ -335,7 +344,11 @@ public class ResourcesManager {
		} else {
		apkAssets = ApkAssets.loadFromPath(path, false /system/, sharedLib);
		}

		if (mLoadedApkAssets != null) {
		mLoadedApkAssets.put(newKey, apkAssets);
		}

		mCachedApkAssets.put(newKey, new WeakReference<>(apkAssets));
		return apkAssets;
		}
		@@ -434,6 +447,7 @@ public class ResourcesManager {

		pw.println("ResourcesManager:");
		pw.increaseIndent();
		if (mLoadedApkAssets != null) {
		pw.print("cached apks: total=");
		pw.print(mLoadedApkAssets.size());
		pw.print(" created=");
		@@ -446,6 +460,9 @@ public class ResourcesManager {
		pw.print(mLoadedApkAssets.missCount());
		pw.print(" max=");
		pw.print(mLoadedApkAssets.maxSize());
		} else {
		pw.print("cached apks: 0 [cache disabled]");
		}
		pw.println();

		pw.print("total apks: ");

core/java/android/appwidget/AppWidgetManagerInternal.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -16,12 +16,9 @@

		package android.appwidget;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.util.ArraySet;

		import java.util.Set;

		/**
		* App widget manager local system service interface.
		*
		@@ -36,4 +33,13 @@ public abstract class AppWidgetManagerInternal {
		* @return Whether the UID hosts widgets from the package.
		*/
		public abstract @Nullable ArraySet<String> getHostedWidgetPackages(int uid);

		/**
		* Execute the widget-related work of unlocking a user. This is intentionally
		* invoked just <em>before</em> the boot-completed broadcast is issued, after
		* the data-related work of unlock has completed.
		*
		* @param userId The user that is being unlocked.
		*/
		public abstract void unlockUser(int userId);
		}

core/java/android/view/autofill/AutofillManager.java

+32 −4

Original line number	Diff line number	Diff line
		@@ -2145,7 +2145,11 @@ public final class AutofillManager {
		pw.print(pfx); pw.print("sessionId: "); pw.println(mSessionId);
		pw.print(pfx); pw.print("state: "); pw.println(getStateAsStringLocked());
		pw.print(pfx); pw.print("context: "); pw.println(mContext);
		pw.print(pfx); pw.print("client: "); pw.println(getClient());
		final AutofillClient client = getClient();
		if (client != null) {
		pw.print(pfx); pw.print("client: "); pw.print(client);
		pw.print(" ("); pw.print(client.autofillClientGetActivityToken()); pw.println(')');
		}
		pw.print(pfx); pw.print("enabled: "); pw.println(mEnabled);
		pw.print(pfx); pw.print("hasService: "); pw.println(mService != null);
		pw.print(pfx); pw.print("hasCallback: "); pw.println(mCallback != null);
		@@ -2164,8 +2168,24 @@ public final class AutofillManager {
		pw.print(pfx); pw.print("entered ids: "); pw.println(mEnteredIds);
		pw.print(pfx); pw.print("save trigger id: "); pw.println(mSaveTriggerId);
		pw.print(pfx); pw.print("save on finish(): "); pw.println(mSaveOnFinish);
		pw.print(pfx); pw.print("compat mode enabled: "); pw.println(
		isCompatibilityModeEnabledLocked());
		pw.print(pfx); pw.print("compat mode enabled: ");
		synchronized (mLock) {
		if (mCompatibilityBridge != null) {
		final String pfx2 = pfx + " ";
		pw.println("true");
		pw.print(pfx2); pw.print("windowId: ");
		pw.println(mCompatibilityBridge.mFocusedWindowId);
		pw.print(pfx2); pw.print("nodeId: ");
		pw.println(mCompatibilityBridge.mFocusedNodeId);
		pw.print(pfx2); pw.print("virtualId: ");
		pw.println(AccessibilityNodeInfo
		.getVirtualDescendantId(mCompatibilityBridge.mFocusedNodeId));
		pw.print(pfx2); pw.print("focusedBounds: ");
		pw.println(mCompatibilityBridge.mFocusedBounds);
		} else {
		pw.println("false");
		}
		}
		pw.print(pfx); pw.print("debug: "); pw.print(sDebug);
		pw.print(" verbose: "); pw.println(sVerbose);
		}
		@@ -2299,7 +2319,15 @@ public final class AutofillManager {
		@Override
		public AccessibilityEvent onAccessibilityEvent(AccessibilityEvent event,
		boolean accessibilityEnabled, int relevantEventTypes) {
		switch (event.getEventType()) {
		final int type = event.getEventType();
		if (sVerbose) {
		// NOTE: this is waaay spammy, but that's life.
		Log.v(TAG, "onAccessibilityEvent(" + AccessibilityEvent.eventTypeToString(type)
		+ "): virtualId="
		+ AccessibilityNodeInfo.getVirtualDescendantId(event.getSourceNodeId())
		+ ", client=" + getClient());
		}
		switch (type) {
		case AccessibilityEvent.TYPE_VIEW_FOCUSED: {
		synchronized (mLock) {
		if (mFocusedWindowId == event.getWindowId()

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public interface QSTile {
		boolean isAvailable();
		void setTileSpec(String tileSpec);

		void clearState();
		@Deprecated default void clearState() {}
		void refreshState();

		void addCallback(Callback callback);