diff options
299 files changed, 2421 insertions, 719 deletions
diff --git a/api/current.txt b/api/current.txt index 72c71c68ea86..ea6f190ca44c 100755 --- a/api/current.txt +++ b/api/current.txt @@ -9475,6 +9475,7 @@ package android.content { public abstract class Context { ctor public Context(); + method public abstract boolean bindIsolatedService(android.content.Intent, android.content.ServiceConnection, int, java.lang.String); method public abstract boolean bindService(android.content.Intent, android.content.ServiceConnection, int); method public abstract int checkCallingOrSelfPermission(java.lang.String); method public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int); @@ -9686,6 +9687,7 @@ package android.content { public class ContextWrapper extends android.content.Context { ctor public ContextWrapper(android.content.Context); method protected void attachBaseContext(android.content.Context); + method public boolean bindIsolatedService(android.content.Intent, android.content.ServiceConnection, int, java.lang.String); method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int); method public int checkCallingOrSelfPermission(java.lang.String); method public int checkCallingOrSelfUriPermission(android.net.Uri, int); @@ -54347,6 +54349,7 @@ package android.widget { method public int getSourceWidth(); method public int getWidth(); method public float getZoom(); + method public boolean isForcePositionWithinWindowSystemInsetsBounds(); method public void setZoom(float); method public void show(float, float); method public void show(float, float, float, float); @@ -54359,6 +54362,7 @@ package android.widget { method public android.widget.Magnifier.Builder setCornerRadius(float); method public android.widget.Magnifier.Builder setDefaultSourceToMagnifierOffset(int, int); method public android.widget.Magnifier.Builder setElevation(float); + method public android.widget.Magnifier.Builder setForcePositionWithinWindowSystemInsetsBounds(boolean); method public android.widget.Magnifier.Builder setSize(int, int); method public android.widget.Magnifier.Builder setZoom(float); } diff --git a/api/system-current.txt b/api/system-current.txt index 5c4efcd90b5b..fa49f07abf52 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7410,6 +7410,7 @@ package android.webkit { method public default void onMovedToDisplay(int, android.content.res.Configuration); method public abstract void onOverScrolled(int, int, boolean, boolean); method public default void onProvideAutofillVirtualStructure(android.view.ViewStructure, int); + method public default boolean onProvideContentCaptureStructure(android.view.ViewStructure, int); method public abstract void onProvideVirtualStructure(android.view.ViewStructure); method public abstract void onScrollChanged(int, int, int, int); method public abstract void onSizeChanged(int, int, int, int); diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp index 05103a962c33..461ad28dc77f 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp @@ -140,7 +140,7 @@ GaugeMetricProducer::GaugeMetricProducer(const ConfigKey& key, const GaugeMetric // Adjust start for partial bucket mCurrentBucketStartTimeNs = startTimeNs; - if (mIsPulled) { + if (mIsPulled && mSamplingType == GaugeMetric::RANDOM_ONE_SAMPLE) { pullAndMatchEventsLocked(startTimeNs); } diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.h b/cmds/statsd/src/metrics/GaugeMetricProducer.h index 5866139047ae..6e3530b0daf4 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.h +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.h @@ -80,7 +80,7 @@ public: } flushCurrentBucketLocked(eventTimeNs); mCurrentBucketStartTimeNs = eventTimeNs; - if (mIsPulled) { + if (mIsPulled && mSamplingType == GaugeMetric::RANDOM_ONE_SAMPLE) { pullAndMatchEventsLocked(eventTimeNs); } }; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index dc707e892d9a..9837deb6143c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -140,6 +140,13 @@ class ReceiverRestrictedContext extends ContextWrapper { throw new ReceiverCallNotAllowedException( "BroadcastReceiver components are not allowed to bind to services"); } + + @Override + public boolean bindIsolatedService(Intent service, ServiceConnection conn, int flags, + String instanceName) { + throw new ReceiverCallNotAllowedException( + "BroadcastReceiver components are not allowed to bind to services"); + } } /** @@ -1630,14 +1637,25 @@ class ContextImpl extends Context { public boolean bindService(Intent service, ServiceConnection conn, int flags) { warnIfCallingFromSystemProcess(); - return bindServiceCommon(service, conn, flags, mMainThread.getHandler(), getUser()); + return bindServiceCommon(service, conn, flags, null, mMainThread.getHandler(), getUser()); + } + + @Override + public boolean bindIsolatedService(Intent service, ServiceConnection conn, + int flags, String instanceName) { + warnIfCallingFromSystemProcess(); + if (instanceName == null) { + throw new NullPointerException("null instanceName"); + } + return bindServiceCommon(service, conn, flags, instanceName, mMainThread.getHandler(), + getUser()); } /** @hide */ @Override public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags, UserHandle user) { - return bindServiceCommon(service, conn, flags, mMainThread.getHandler(), user); + return bindServiceCommon(service, conn, flags, null, mMainThread.getHandler(), user); } /** @hide */ @@ -1647,7 +1665,7 @@ class ContextImpl extends Context { if (handler == null) { throw new IllegalArgumentException("handler must not be null."); } - return bindServiceCommon(service, conn, flags, handler, user); + return bindServiceCommon(service, conn, flags, null, handler, user); } /** @hide */ @@ -1669,7 +1687,8 @@ class ContextImpl extends Context { return mMainThread.getHandler(); } - private boolean bindServiceCommon(Intent service, ServiceConnection conn, int flags, Handler + private boolean bindServiceCommon(Intent service, ServiceConnection conn, int flags, + String instanceName, Handler handler, UserHandle user) { // Keep this in sync with DevicePolicyManager.bindDeviceAdminServiceAsUser. IServiceConnection sd; @@ -1690,10 +1709,10 @@ class ContextImpl extends Context { flags |= BIND_WAIVE_PRIORITY; } service.prepareToLeaveProcess(this); - int res = ActivityManager.getService().bindService( + int res = ActivityManager.getService().bindIsolatedService( mMainThread.getApplicationThread(), getActivityToken(), service, service.resolveTypeIfNeeded(getContentResolver()), - sd, flags, getOpPackageName(), user.getIdentifier()); + sd, flags, instanceName, getOpPackageName(), user.getIdentifier()); if (res < 0) { throw new SecurityException( "Not allowed to bind to service " + service); diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index e2312a539ae4..f27c6677ed22 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -133,9 +133,13 @@ interface IActivityManager { in String resolvedType, boolean requireForeground, in String callingPackage, int userId); int stopService(in IApplicationThread caller, in Intent service, in String resolvedType, int userId); + // Currently keeping old bindService because it is on the greylist int bindService(in IApplicationThread caller, in IBinder token, in Intent service, in String resolvedType, in IServiceConnection connection, int flags, in String callingPackage, int userId); + int bindIsolatedService(in IApplicationThread caller, in IBinder token, in Intent service, + in String resolvedType, in IServiceConnection connection, int flags, + in String instanceName, in String callingPackage, int userId); boolean unbindService(in IServiceConnection connection); void publishService(in IBinder token, in Intent intent, in IBinder service); void setDebugApp(in String packageName, boolean waitForDebugger, boolean persistent); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 9f8ae0bb6ab3..03eba7efea91 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2906,8 +2906,9 @@ public abstract class Context { * @param flags Operation options for the binding. May be 0, * {@link #BIND_AUTO_CREATE}, {@link #BIND_DEBUG_UNBIND}, * {@link #BIND_NOT_FOREGROUND}, {@link #BIND_ABOVE_CLIENT}, - * {@link #BIND_ALLOW_OOM_MANAGEMENT}, or - * {@link #BIND_WAIVE_PRIORITY}. + * {@link #BIND_ALLOW_OOM_MANAGEMENT}, {@link #BIND_WAIVE_PRIORITY}. + * {@link #BIND_IMPORTANT}, or + * {@link #BIND_ADJUST_WITH_ACTIVITY}. * @return {@code true} if the system is in the process of bringing up a * service that your client has permission to bind to; {@code false} * if the system couldn't find the service or if your client doesn't @@ -2923,11 +2924,38 @@ public abstract class Context { * @see #BIND_AUTO_CREATE * @see #BIND_DEBUG_UNBIND * @see #BIND_NOT_FOREGROUND + * @see #BIND_ABOVE_CLIENT + * @see #BIND_ALLOW_OOM_MANAGEMENT + * @see #BIND_WAIVE_PRIORITY + * @see #BIND_IMPORTANT + * @see #BIND_ADJUST_WITH_ACTIVITY */ public abstract boolean bindService(@RequiresPermission Intent service, @NonNull ServiceConnection conn, @BindServiceFlags int flags); /** + * Variation of {@link #bindService} that, in the specific case of isolated + * services, allows the caller to generate multiple instances of a service + * from a single component declaration. + * + * @param service Identifies the service to connect to. The Intent must + * specify an explicit component name. + * @param conn Receives information as the service is started and stopped. + * This must be a valid ServiceConnection object; it must not be null. + * @param flags Operation options for the binding as per {@link #bindService}. + * @param instanceName Unique identifier for the service instance. Each unique + * name here will result in a different service instance being created. + * @return Returns success of binding as per {@link #bindService}. + * + * @throws SecurityException If the caller does not have permission to access the service + * + * @see #bindService + */ + public abstract boolean bindIsolatedService(@RequiresPermission Intent service, + @NonNull ServiceConnection conn, @BindServiceFlags int flags, + @NonNull String instanceName); + + /** * Same as {@link #bindService(Intent, ServiceConnection, int)}, but with an explicit userHandle * argument for use by system server and other multi-user aware code. * @hide @@ -2941,7 +2969,7 @@ public abstract class Context { } /** - * Same as {@link #bindService(Intent, ServiceConnection, int, UserHandle)}, but with an + * Same as {@link #bindServiceAsUser(Intent, ServiceConnection, int, UserHandle)}, but with an * explicit non-null Handler to run the ServiceConnection callbacks on. * * @hide diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index bfad2b42bc94..88696b0e1e4d 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -705,6 +705,12 @@ public class ContextWrapper extends Context { return mBase.bindService(service, conn, flags); } + @Override + public boolean bindIsolatedService(Intent service, ServiceConnection conn, + int flags, String instanceName) { + return mBase.bindIsolatedService(service, conn, flags, instanceName); + } + /** @hide */ @Override public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags, diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index d679fc7e619a..423ce771969f 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -268,6 +268,9 @@ public class StorageManager { public static final int ENCRYPTION_STATE_ERROR_CORRUPT = IVold.ENCRYPTION_STATE_ERROR_CORRUPT; + /** @hide Prefix used in sandboxIds for apps with sharedUserIds */ + public static final String SHARED_SANDBOX_PREFIX = "shared-"; + private static volatile IStorageManager sStorageManager = null; private final Context mContext; diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 4a7e783ffbdb..a8debbd623f5 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -77,11 +77,17 @@ public final class WindowInsets { CONSUMED = new WindowInsets((Insets) null, null, null, false, false, null); } - /** @hide */ + /** + * Construct a new WindowInsets from individual insets. + * + * A {@code null} inset indicates that the respective inset is consumed. + * + * @hide + */ public WindowInsets(Rect systemWindowInsets, Rect windowDecorInsets, Rect stableInsets, boolean isRound, boolean alwaysConsumeNavBar, DisplayCutout displayCutout) { - this(Insets.of(systemWindowInsets), Insets.of(windowDecorInsets), Insets.of(stableInsets), - isRound, alwaysConsumeNavBar, displayCutout); + this(insetsOrNull(systemWindowInsets), insetsOrNull(windowDecorInsets), + insetsOrNull(stableInsets), isRound, alwaysConsumeNavBar, displayCutout); } private WindowInsets(Insets systemWindowInsets, Insets windowDecorInsets, @@ -673,6 +679,10 @@ public final class WindowInsets { return Insets.of(newLeft, newTop, newRight, newBottom); } + private static Insets insetsOrNull(Rect insets) { + return insets != null ? Insets.of(insets) : null; + } + /** * @return whether system window insets have been consumed. */ diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f343a52b365c..10937196a74f 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2695,6 +2695,11 @@ public class WebView extends AbsoluteLayout } @Override + public boolean onProvideContentCaptureStructure(ViewStructure structure, int flags) { + return mProvider.getViewDelegate().onProvideContentCaptureStructure(structure, flags); + } + + @Override public void autofill(SparseArray<AutofillValue>values) { mProvider.getViewDelegate().autofill(values); } diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java index 00e782bd5046..ceada07c715b 100644 --- a/core/java/android/webkit/WebViewProvider.java +++ b/core/java/android/webkit/WebViewProvider.java @@ -341,6 +341,12 @@ public interface WebViewProvider { return true; // true is the default value returned by View.isVisibleToUserForAutofill() } + default boolean onProvideContentCaptureStructure( + @SuppressWarnings("unused") android.view.ViewStructure structure, + @SuppressWarnings("unused") int flags) { + return false; // WebView provides virtual views and is responsible to notify manager + } + public AccessibilityNodeProvider getAccessibilityNodeProvider(); public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info); diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java index 9da2a4307a93..9f509b1f3d0b 100644 --- a/core/java/android/widget/Magnifier.java +++ b/core/java/android/widget/Magnifier.java @@ -93,6 +93,8 @@ public final class Magnifier { private final int mDefaultHorizontalSourceToMagnifierOffset; // The vertical offset between the source and window coords when #show(float, float) is used. private final int mDefaultVerticalSourceToMagnifierOffset; + // Whether the magnifier will be clamped inside the main surface and not overlap system insets. + private final boolean mForcePositionWithinWindowSystemInsetsBounds; // The parent surface for the magnifier surface. private SurfaceInfo mParentSurface; // The surface where the content will be copied from. @@ -141,6 +143,8 @@ public final class Magnifier { params.mHorizontalDefaultSourceToMagnifierOffset; mDefaultVerticalSourceToMagnifierOffset = params.mVerticalDefaultSourceToMagnifierOffset; + mForcePositionWithinWindowSystemInsetsBounds = + params.mForcePositionWithinWindowSystemInsetsBounds; // The view's surface coordinates will not be updated until the magnifier is first shown. mViewCoordinatesInSurface = new int[2]; } @@ -379,6 +383,17 @@ public final class Magnifier { } /** + * Returns whether the magnifier position will be adjusted such that the magnifier will be + * fully within the bounds of the main application window, by also avoiding any overlap with + * system insets (such as the one corresponding to the status bar). + * @return whether the magnifier position will be adjusted + * @see Magnifier.Builder#setForcePositionWithinWindowSystemInsetsBounds(boolean) + */ + public boolean isForcePositionWithinWindowSystemInsetsBounds() { + return mForcePositionWithinWindowSystemInsetsBounds; + } + + /** * Returns the top left coordinates of the magnifier, relative to the surface of the * main application window. They will be determined by the coordinates of the last * {@link #show(float, float)} or {@link #show(float, float, float, float)} call, adjusted @@ -567,6 +582,11 @@ public final class Magnifier { * @return the current window coordinates, after they are clamped inside the parent surface */ private Point getCurrentClampedWindowCoordinates() { + if (!mForcePositionWithinWindowSystemInsetsBounds) { + // No position adjustment should be done, so return the raw coordinates. + return new Point(mWindowCoords); + } + final Rect windowBounds; if (mParentSurface.mIsMainWindowSurface) { final Insets systemInsets = mView.getRootWindowInsets().getSystemWindowInsets(); @@ -891,6 +911,7 @@ public final class Magnifier { private @FloatRange(from = 0f) float mCornerRadius; private int mHorizontalDefaultSourceToMagnifierOffset; private int mVerticalDefaultSourceToMagnifierOffset; + private boolean mForcePositionWithinWindowSystemInsetsBounds; /** * Construct a new builder for {@link Magnifier} objects. @@ -915,6 +936,7 @@ public final class Magnifier { mVerticalDefaultSourceToMagnifierOffset = a.getDimensionPixelSize(R.styleable.Magnifier_magnifierVerticalOffset, 0); a.recycle(); + mForcePositionWithinWindowSystemInsetsBounds = true; } /** @@ -1000,6 +1022,28 @@ public final class Magnifier { } /** + * Defines the behavior of the magnifier when it is requested to position outside the + * surface of the main application window. The default value is {@code true}, which means + * that the position will be adjusted such that the magnifier will be fully within the + * bounds of the main application window, by also avoiding any overlap with system insets + * (such as the one corresponding to the status bar). If you require a custom behavior, this + * flag should be set to {@code false}, meaning that the magnifier will be able to cross the + * main application surface boundaries (and also overlap the system insets). This should be + * handled with care, when passing coordinates to {@link #show(float, float)}; note that: + * <ul> + * <li>in a multiwindow context, if the magnifier crosses the boundary between the two + * windows, it will not be able to show over the window of the other application</li> + * <li>if the magnifier overlaps the status bar, there is no guarantee about which one + * will be displayed on top. This should be handled with care.</li> + * </ul> + * @param force whether the magnifier position will be adjusted + */ + public Builder setForcePositionWithinWindowSystemInsetsBounds(boolean force) { + mForcePositionWithinWindowSystemInsetsBounds = force; + return this; + } + + /** * Builds a {@link Magnifier} instance based on the configuration of this {@link Builder}. */ public @NonNull Magnifier build() { diff --git a/core/tests/coretests/src/android/view/WindowInsetsTest.java b/core/tests/coretests/src/android/view/WindowInsetsTest.java new file mode 100644 index 000000000000..1c2df2cfedb1 --- /dev/null +++ b/core/tests/coretests/src/android/view/WindowInsetsTest.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view; + +import static org.junit.Assert.assertTrue; + +import android.graphics.Rect; +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +@SmallTest +@Presubmit +public class WindowInsetsTest { + + @Test + public void systemWindowInsets_afterConsuming_isConsumed() { + assertTrue(new WindowInsets(new Rect(1, 2, 3, 4), null, null, false, false, null) + .consumeSystemWindowInsets().isConsumed()); + } + + @Test + public void multiNullConstructor_isConsumed() { + assertTrue(new WindowInsets(null, null, null, false, false, null).isConsumed()); + } + + @Test + public void singleNullConstructor_isConsumed() { + assertTrue(new WindowInsets((Rect) null).isConsumed()); + } + +} diff --git a/core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java b/core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java index 01382aae923e..4e0f2a8fe060 100644 --- a/core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java +++ b/core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java @@ -81,7 +81,7 @@ public class KernelPackageMappingTests { @Test public void testSharedInstalledPrimary() throws Exception { - assertEquals("1001", getContent(getKernelPackageFile("shared:android.uid.phone", "appid"))); + assertEquals("1001", getContent(getKernelPackageFile("shared-android.uid.phone", "appid"))); } @Test @@ -92,7 +92,7 @@ public class KernelPackageMappingTests { @Test public void testSharedInstalledAll() throws Exception { - assertEquals("", getContent(getKernelPackageFile("shared:android.uid.phone", + assertEquals("", getContent(getKernelPackageFile("shared-android.uid.phone", "excluded_userids"))); } diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index c7945bd02c49..84cb5f80ece3 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -194,6 +194,8 @@ applications that come with the platform <privapp-permissions package="com.android.providers.calendar"> <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/> + <permission name="android.permission.INTERACT_ACROSS_USERS" /> + <permission name="android.permission.MANAGE_USERS" /> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.USE_RESERVED_DISK"/> </privapp-permissions> diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java index 4ac0188581e8..9b97b1060c8a 100644 --- a/media/java/android/media/MediaPlayer2Impl.java +++ b/media/java/android/media/MediaPlayer2Impl.java @@ -700,7 +700,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { // return true if there is a next data source, false otherwise. // This function should be always called on |mHandlerThread|. private boolean prepareNextDataSource() { - if (Looper.myLooper() != mHandlerThread.getLooper()) { + HandlerThread handlerThread = mHandlerThread; + if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { Log.e(TAG, "prepareNextDataSource: called on wrong looper"); } @@ -736,7 +737,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { // This function should be always called on |mHandlerThread|. private void playNextDataSource() { - if (Looper.myLooper() != mHandlerThread.getLooper()) { + HandlerThread handlerThread = mHandlerThread; + if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { Log.e(TAG, "playNextDataSource: called on wrong looper"); } diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierText.java b/packages/SystemUI/src/com/android/keyguard/CarrierText.java index a0a36878634a..b7d51978fab2 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierText.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierText.java @@ -16,10 +16,6 @@ package com.android.keyguard; -import java.util.List; -import java.util.Locale; -import java.util.Objects; - import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -28,6 +24,7 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiManager; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.method.SingleLineTransformationMethod; import android.util.AttributeSet; @@ -40,7 +37,9 @@ import com.android.internal.telephony.IccCardConstants.State; import com.android.internal.telephony.TelephonyIntents; import com.android.settingslib.WirelessUtils; -import android.telephony.TelephonyManager; +import java.util.List; +import java.util.Locale; +import java.util.Objects; public class CarrierText extends TextView { private static final boolean DEBUG = KeyguardConstants.DEBUG; diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java index ac8f0246a608..210b82d1d69c 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java @@ -16,7 +16,6 @@ package com.android.keyguard; -import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.content.Context; @@ -37,8 +36,8 @@ import android.widget.Button; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.IccCardConstants.State; -import com.android.internal.widget.LockPatternUtils; import com.android.internal.util.EmergencyAffordanceManager; +import com.android.internal.widget.LockPatternUtils; import com.android.systemui.util.EmergencyDialerConstants; /** diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java index 63b7ae2d856a..c2bbfbf73bb6 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java @@ -22,19 +22,15 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Handler; -import android.os.HandlerThread; import android.os.UserHandle; +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; +import android.telephony.euicc.EuiccManager; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.Button; -import android.telephony.SubscriptionManager; -import android.telephony.SubscriptionInfo; -import android.telephony.euicc.EuiccManager; -import android.util.Log; - -import java.lang.ref.WeakReference; /*** * This button is used by the device with embedded SIM card to disable current carrier to unlock diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java index 34df15f17869..cf22286c1614 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java @@ -19,8 +19,8 @@ package com.android.keyguard; import android.app.Activity; import android.app.ActivityManager; import android.content.Context; -import android.content.res.Resources; import android.content.res.ColorStateList; +import android.content.res.Resources; import android.graphics.Canvas; import android.media.AudioManager; import android.os.SystemClock; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index f400f6039882..3cc18ddf3b2a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -23,8 +23,6 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; - /** * A Pin based Keyguard input view */ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index b8df3c067969..7af27f2ed49a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -21,7 +21,6 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.res.ColorStateList; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; @@ -31,6 +30,8 @@ import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardSecurityModel.SecurityMode; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java index 1a09364f564c..272b3bdf56a4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java @@ -15,9 +15,10 @@ */ package com.android.keyguard; -import com.android.internal.widget.LockPatternUtils; import android.content.res.ColorStateList; +import com.android.internal.widget.LockPatternUtils; + public interface KeyguardSecurityView { static public final int SCREEN_ON = 1; static public final int VIEW_REVEALED = 2; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java index 74e2a6835b41..e6a02506b4a3 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java @@ -18,8 +18,8 @@ package com.android.keyguard; import android.annotation.NonNull; import android.content.Context; -import android.content.res.TypedArray; import android.content.res.ColorStateList; +import android.content.res.TypedArray; import android.graphics.Rect; import android.util.AttributeSet; import android.util.Log; @@ -28,18 +28,15 @@ import android.view.View; import android.view.ViewDebug; import android.view.ViewGroup; import android.view.ViewHierarchyEncoder; -import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ViewFlipper; import com.android.internal.widget.LockPatternUtils; -import java.lang.Override; - /** * Subclass of the current view flipper that allows us to overload dispatchTouchEvent() so - * we can emulate {@link WindowManager.LayoutParams#FLAG_SLIPPERY} within a view hierarchy. - * + * we can emulate {@link android.view.WindowManager.LayoutParams#FLAG_SLIPPERY} within a view + * hierarchy. */ public class KeyguardSecurityViewFlipper extends ViewFlipper implements KeyguardSecurityView { private static final String TAG = "KeyguardSecurityViewFlipper"; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java index 42c7a5680d11..6528d8c07a6c 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java @@ -16,32 +16,31 @@ package com.android.keyguard; -import com.android.internal.telephony.ITelephony; -import com.android.internal.telephony.IccCardConstants; -import com.android.internal.telephony.IccCardConstants.State; -import com.android.internal.telephony.PhoneConstants; - -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.Configuration; -import android.content.res.Resources; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; import android.app.ProgressDialog; +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Color; import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.telephony.euicc.EuiccManager; import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.ImageView; +import com.android.internal.telephony.ITelephony; +import com.android.internal.telephony.IccCardConstants; +import com.android.internal.telephony.IccCardConstants.State; +import com.android.internal.telephony.PhoneConstants; + /** * Displays a PIN pad for unlocking. */ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java index 1b61568276ce..1157f86872ec 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java @@ -16,20 +16,19 @@ package com.android.keyguard; -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.Resources; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.Resources; import android.graphics.Color; import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.telephony.euicc.EuiccManager; import android.util.AttributeSet; import android.util.Log; import android.view.View; @@ -38,8 +37,8 @@ import android.widget.ImageView; import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.IccCardConstants; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.IccCardConstants.State; +import com.android.internal.telephony.PhoneConstants; /** diff --git a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java index bbc8ecdcc066..5ed9eaad0a00 100644 --- a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java +++ b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java @@ -18,7 +18,6 @@ import android.annotation.Nullable; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; -import android.os.LocaleList; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/DejankUtils.java b/packages/SystemUI/src/com/android/systemui/DejankUtils.java index 4ee3bd37ce3c..bec8820a3053 100644 --- a/packages/SystemUI/src/com/android/systemui/DejankUtils.java +++ b/packages/SystemUI/src/com/android/systemui/DejankUtils.java @@ -16,12 +16,12 @@ package com.android.systemui; -import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.util.Assert; - import android.os.Handler; import android.view.Choreographer; +import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.util.Assert; + import java.util.ArrayList; /** diff --git a/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java b/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java index 81e4db3b2561..5c0df179dd27 100644 --- a/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java +++ b/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java @@ -14,7 +14,6 @@ package com.android.systemui; -import android.os.IBinder; import android.os.RemoteException; import android.util.Log; import android.view.IDockedStackListener; diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index f5ad7476a156..ecf4c0a86bfc 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -32,9 +32,9 @@ import android.view.View; import android.view.ViewConfiguration; import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; -import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.statusbar.policy.ScrollAdapter; public class ExpandHelper implements Gefingerpoken { diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java index 1fa925e5ad1f..bab472c2e687 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java @@ -23,7 +23,6 @@ import android.service.notification.StatusBarNotification; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; -import android.util.Slog; import android.util.SparseArray; import com.android.internal.messages.nano.SystemMessageProto; diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServicesDialog.java b/packages/SystemUI/src/com/android/systemui/ForegroundServicesDialog.java index 9d286cf7e6d5..cb9523fcaed1 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServicesDialog.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServicesDialog.java @@ -42,8 +42,6 @@ import com.android.internal.app.AlertController; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; -import com.android.systemui.R; - import java.util.ArrayList; /** diff --git a/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java b/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java index b1463a3c53ea..16e869e9d317 100644 --- a/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java +++ b/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java @@ -14,6 +14,10 @@ package com.android.systemui; +import static com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE; +import static com.android.systemui.util.leak.RotationUtils.ROTATION_NONE; +import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -33,10 +37,6 @@ import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; import com.android.systemui.util.leak.RotationUtils; -import static com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE; -import static com.android.systemui.util.leak.RotationUtils.ROTATION_NONE; -import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE; - public class HardwareUiLayout extends LinearLayout implements Tunable { private static final String EDGE_BLEED = "sysui_hwui_edge_bleed"; diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index d8eb96504e79..1d2d7fafe800 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -20,6 +20,7 @@ import android.app.WallpaperManager; import android.content.ComponentCallbacks2; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.RecordingCanvas; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region.Op; @@ -30,7 +31,6 @@ import android.service.wallpaper.WallpaperService; import android.util.Log; import android.view.Display; import android.view.DisplayInfo; -import android.graphics.RecordingCanvas; import android.view.Surface; import android.view.SurfaceHolder; import android.view.WindowManager; diff --git a/packages/SystemUI/src/com/android/systemui/LatencyTester.java b/packages/SystemUI/src/com/android/systemui/LatencyTester.java index 1e458fa5c112..50f1b44b05b1 100644 --- a/packages/SystemUI/src/com/android/systemui/LatencyTester.java +++ b/packages/SystemUI/src/com/android/systemui/LatencyTester.java @@ -16,17 +16,17 @@ package com.android.systemui; -import android.hardware.biometrics.BiometricSourceType; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.hardware.biometrics.BiometricSourceType; import android.os.Build; import android.os.PowerManager; import android.os.SystemClock; -import com.android.keyguard.KeyguardUpdateMonitor; import com.android.internal.util.LatencyTracker; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.statusbar.phone.BiometricUnlockController; import com.android.systemui.statusbar.phone.StatusBar; diff --git a/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java b/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java index f6ad62616a96..f9617cad848e 100644 --- a/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java +++ b/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java @@ -21,8 +21,8 @@ import android.util.Log; import android.view.View; import com.android.systemui.plugins.PluginListener; -import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.plugins.ViewProvider; +import com.android.systemui.shared.plugins.PluginManager; /** * Define an interface or abstract class as follows that includes the diff --git a/packages/SystemUI/src/com/android/systemui/RegionInterceptingFrameLayout.java b/packages/SystemUI/src/com/android/systemui/RegionInterceptingFrameLayout.java index 6dc2d67a1c78..8351bbfaa430 100644 --- a/packages/SystemUI/src/com/android/systemui/RegionInterceptingFrameLayout.java +++ b/packages/SystemUI/src/com/android/systemui/RegionInterceptingFrameLayout.java @@ -21,7 +21,6 @@ import android.graphics.Region; import android.graphics.Region.Op; import android.util.AttributeSet; import android.view.View; -import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.InternalInsetsInfo; import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; import android.widget.FrameLayout; diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index c84449683c1c..1dd231ca7642 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -63,6 +63,8 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.util.Preconditions; import com.android.systemui.RegionInterceptingFrameLayout.RegionInterceptableView; import com.android.systemui.fragments.FragmentHostManager; @@ -79,8 +81,6 @@ import com.android.systemui.util.leak.RotationUtils; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * An overlay that draws screen decorations in software (e.g for rounded corners or display cutout) * for antialiasing and emulation purposes. diff --git a/packages/SystemUI/src/com/android/systemui/SysUIToast.java b/packages/SystemUI/src/com/android/systemui/SysUIToast.java index 43b918dbea73..8bcf0571b2d0 100644 --- a/packages/SystemUI/src/com/android/systemui/SysUIToast.java +++ b/packages/SystemUI/src/com/android/systemui/SysUIToast.java @@ -15,11 +15,12 @@ */ package com.android.systemui; +import static android.widget.Toast.Duration; + import android.annotation.StringRes; import android.content.Context; import android.view.WindowManager; import android.widget.Toast; -import static android.widget.Toast.Duration; public class SysUIToast { diff --git a/packages/SystemUI/src/com/android/systemui/SystemBars.java b/packages/SystemUI/src/com/android/systemui/SystemBars.java index b5093b3ce52a..6edc23be8e23 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemBars.java +++ b/packages/SystemUI/src/com/android/systemui/SystemBars.java @@ -14,13 +14,8 @@ package com.android.systemui; -import android.content.res.Configuration; -import android.provider.Settings; import android.util.Log; -import com.android.systemui.R; -import com.android.systemui.SystemUI; - import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index c4bf27b5104a..2dd362e97ccc 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -22,9 +22,9 @@ import android.util.ArrayMap; import android.util.Log; import android.view.ViewGroup; +import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.util.function.TriConsumer; import com.android.internal.widget.LockPatternUtils; -import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.Dependency.DependencyProvider; import com.android.systemui.classifier.FalsingManager; @@ -32,20 +32,20 @@ import com.android.systemui.keyguard.DismissCallbackRegistry; import com.android.systemui.qs.QSTileHost; import com.android.systemui.statusbar.AmbientPulseManager; import com.android.systemui.statusbar.KeyguardIndicationController; -import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; -import com.android.systemui.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager; -import com.android.systemui.statusbar.notification.NotificationEntryManager; -import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; -import com.android.systemui.statusbar.notification.logging.NotificationLogger; +import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationViewHierarchyManager; import com.android.systemui.statusbar.ScrimView; import com.android.systemui.statusbar.SmartReplyController; +import com.android.systemui.statusbar.StatusBarStateController; +import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.notification.logging.NotificationLogger; +import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager; +import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java index 8e29841e887d..ac108becfeb2 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java @@ -24,13 +24,13 @@ import android.os.Process; import android.os.SystemProperties; import android.util.Slog; -import java.io.FileDescriptor; -import java.io.PrintWriter; - import com.android.internal.os.BinderInternal; import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.plugins.PluginManagerImpl; +import java.io.FileDescriptor; +import java.io.PrintWriter; + public class SystemUIService extends Service { @Override diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java b/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java index 4bd095de3777..79d4f8d634ce 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java @@ -31,7 +31,6 @@ import android.os.Handler; import android.view.View; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; -import android.view.animation.AnimationUtils; import com.android.systemui.Interpolators; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java b/packages/SystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java index 96af08b6bf6b..50fefe948aa8 100644 --- a/packages/SystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java +++ b/packages/SystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java @@ -17,9 +17,9 @@ package com.android.systemui.car; import android.content.Context; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.NotificationEntryManager; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; public class CarNotificationEntryManager extends NotificationEntryManager { public CarNotificationEntryManager(Context context) { diff --git a/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java index e4b2e07dc81e..09c000b469a7 100644 --- a/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java @@ -23,10 +23,10 @@ import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.Dependency.DependencyProvider; import com.android.systemui.SystemUIFactory; import com.android.systemui.statusbar.NotificationMediaManager; -import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.car.CarFacetButtonController; import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager; import com.android.systemui.statusbar.car.hvac.HvacController; +import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; /** diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java b/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java index 158deb46f8d2..28a38083218e 100644 --- a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java +++ b/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java @@ -17,16 +17,7 @@ package com.android.systemui.chooser; import android.app.Activity; -import android.app.ActivityManager; -import android.content.Intent; import android.os.Bundle; -import android.os.IBinder; -import android.util.Log; - -import com.android.systemui.R; - -import java.lang.Thread; -import java.util.ArrayList; /** * Activity for selecting which application ought to handle an ACTION_SEND intent. diff --git a/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java index cdf4ba7d99d7..6d13973d23b5 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java @@ -18,7 +18,6 @@ package com.android.systemui.classifier; import android.os.Build; import android.os.SystemProperties; -import android.util.Log; import android.view.MotionEvent; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingLog.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingLog.java index 71ddba5ffdcc..cb7c998fad8e 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingLog.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingLog.java @@ -23,8 +23,6 @@ import android.os.SystemProperties; import android.util.Log; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.text.SimpleDateFormat; diff --git a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java index 592a275edaa0..577d57a9990e 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java @@ -24,13 +24,11 @@ import android.os.Looper; import android.os.UserHandle; import android.provider.Settings; import android.util.DisplayMetrics; -import android.util.Log; import android.view.MotionEvent; import com.android.systemui.R; import java.util.ArrayDeque; -import java.util.ArrayList; /** * An classifier trying to determine whether it is a human interacting with the phone or not. diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java index e2047bf89833..d93ed1785a0a 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java @@ -22,7 +22,6 @@ import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorManager; import android.os.Handler; -import android.os.PowerManager; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.keyguard.KeyguardUpdateMonitor; diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java index ce84b84935c5..01a234544c5b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java @@ -33,8 +33,6 @@ import android.provider.Settings; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.Dependency; -import java.util.concurrent.atomic.AtomicBoolean; - /** * Controls the screen brightness when dozing. */ @@ -66,7 +64,6 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi * --ei brightness_bucket 1} */ private int mDebugBrightnessBucket = -1; - private AtomicBoolean mIsDestroyed = new AtomicBoolean(); @VisibleForTesting public DozeScreenBrightness(Context context, DozeMachine.Service service, @@ -89,9 +86,7 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi Dependency.get(Dependency.BG_HANDLER).post(()-> { IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_AOD_BRIGHTNESS); - if (!mIsDestroyed.get()) { - mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, null, handler); - } + mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, null, handler); }); } } @@ -129,10 +124,11 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi } private void onDestroy() { - mIsDestroyed.set(true); setLightSensorEnabled(false); if (mDebuggable) { - mContext.unregisterReceiver(this); + Dependency.get(Dependency.BG_HANDLER).post(()-> { + mContext.unregisterReceiver(this); + }); } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java index 4fc2d9bd344b..25c2c39f3e25 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java @@ -16,9 +16,10 @@ package com.android.systemui.doze; -import androidx.annotation.VisibleForTesting; import android.view.Display; +import androidx.annotation.VisibleForTesting; + import com.android.systemui.statusbar.phone.DozeParameters; /** diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java index 3013b969c74b..a0c490951199 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java @@ -16,9 +16,10 @@ package com.android.systemui.doze; -import androidx.annotation.VisibleForTesting; import android.view.Display; +import androidx.annotation.VisibleForTesting; + import com.android.systemui.statusbar.phone.DozeParameters; /** diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java b/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java index 47f86fed7e69..9a5a5b855999 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java @@ -23,8 +23,6 @@ import android.os.ServiceManager; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.statusbar.phone.DozeParameters; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java index f06ea451d4d0..84b91bc8e3a1 100644 --- a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java +++ b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java @@ -19,7 +19,6 @@ package com.android.systemui.egg; import android.app.Activity; import android.os.Bundle; import android.view.View; -import android.view.ViewGroup; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index 779a86cdc6be..60e39b21680b 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -28,11 +28,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Parcelable; -import androidx.annotation.NonNull; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; +import androidx.annotation.NonNull; + import com.android.settingslib.applications.InterestingConfigChanges; import com.android.systemui.Dependency; import com.android.systemui.plugins.Plugin; diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java index e0657c90238f..7d52a9a08c2a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java +++ b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java @@ -43,12 +43,12 @@ import android.util.Slog; import android.widget.Toast; import com.android.settingslib.bluetooth.BluetoothCallback; +import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SystemUI; diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/DismissCallbackRegistry.java b/packages/SystemUI/src/com/android/systemui/keyguard/DismissCallbackRegistry.java index d833c16c04b3..7bec5c0349f9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/DismissCallbackRegistry.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/DismissCallbackRegistry.java @@ -19,6 +19,7 @@ package com.android.systemui.keyguard; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.systemui.Dependency; import com.android.systemui.UiOffloadThread; + import java.util.ArrayList; /** diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java index 4c98c08222e3..b3481c52d7f2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java @@ -19,8 +19,6 @@ package com.android.systemui.keyguard; import android.os.Handler; import android.os.Message; -import com.android.internal.policy.IKeyguardDrawnCallback; - /** * Dispatches the lifecycles keyguard gets from WindowManager on the main thread. */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 22b41a4f9cfa..81247cd2f727 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -16,6 +16,8 @@ package com.android.systemui.keyguard; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + import android.app.Service; import android.content.Intent; import android.os.Binder; @@ -34,8 +36,6 @@ import com.android.internal.policy.IKeyguardStateCallback; import com.android.systemui.Dependency; import com.android.systemui.SystemUIApplication; -import static android.content.pm.PackageManager.PERMISSION_GRANTED; - public class KeyguardService extends Service { static final String TAG = "KeyguardService"; static final String PERMISSION = android.Manifest.permission.CONTROL_KEYGUARD; diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index fe1b35609ae5..3b9110d31c6f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1940,11 +1940,6 @@ public class KeyguardViewMediator extends SystemUI { mContext.getSystemService(Context.STATUS_BAR_SERVICE); } - // TODO(b/113914868): investigation log for disappearing home button - Log.d(TAG, "adjustStatusBarLocked (b/113914868): mShowing=" + mShowing - + " mStatusBarManager=" + mStatusBarManager + " mOccluded=" - + mOccluded + " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons); - if (mStatusBarManager == null) { Log.w(TAG, "Could not get status bar manager"); } else { @@ -1961,6 +1956,12 @@ public class KeyguardViewMediator extends SystemUI { + " --> flags=0x" + Integer.toHexString(flags)); } + // TODO(b/113914868): investigation log for disappearing home button + Log.d(TAG, "adjustStatusBarLocked (b/113914868): flags=" + flags + + "mShowing=" + mShowing + " mStatusBarManager=" + mStatusBarManager + + " mOccluded=" + mOccluded + " isSecure=" + isSecure() + + " force=" + forceHideHomeRecentsButtons); + mStatusBarManager.disable(flags); } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivityController.java b/packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivityController.java index 74f770679cc9..6498b9161be7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivityController.java @@ -28,6 +28,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; + import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; diff --git a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java index ab612dd93dd1..ddd9cbf209d6 100644 --- a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java +++ b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java @@ -33,10 +33,8 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.provider.MediaStore; -import android.provider.MediaStore.Audio.AudioColumns; import android.util.Log; -import com.android.internal.util.Preconditions; import com.android.systemui.SystemUI; import java.io.FileDescriptor; diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipUI.java b/packages/SystemUI/src/com/android/systemui/pip/PipUI.java index 70b581a78ce4..7792e177b601 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipUI.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipUI.java @@ -23,8 +23,10 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.os.UserHandle; import android.os.UserManager; + import com.android.systemui.SystemUI; import com.android.systemui.statusbar.CommandQueue; + import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java index 9ce2606a2a15..8615e43b73fe 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java @@ -27,6 +27,7 @@ import android.view.View; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.widget.FrameLayout; + import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.shared.system.WindowManagerWrapper; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 08208e506f24..8c3f43635f72 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -35,6 +35,7 @@ import android.view.IPinnedStackController; import android.view.IPinnedStackListener; import android.view.IWindowManager; import android.view.WindowManagerGlobal; + import com.android.systemui.Dependency; import com.android.systemui.UiOffloadThread; import com.android.systemui.pip.BasePipManager; @@ -42,6 +43,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.WindowManagerWrapper; + import java.io.PrintWriter; /** diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index b746c192cece..e447defadd08 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -23,15 +23,14 @@ import static android.provider.Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_ACTIONS; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_ALLOW_TIMEOUT; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_CONTROLLER_MESSENGER; -import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_WILL_RESIZE_MENU; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_DISMISS_FRACTION; -import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_MOVEMENT_BOUNDS; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_MENU_STATE; +import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_MOVEMENT_BOUNDS; import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_STACK_BOUNDS; - -import static com.android.systemui.pip.phone.PipMenuActivityController.MENU_STATE_NONE; +import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_WILL_RESIZE_MENU; import static com.android.systemui.pip.phone.PipMenuActivityController.MENU_STATE_CLOSE; import static com.android.systemui.pip.phone.PipMenuActivityController.MENU_STATE_FULL; +import static com.android.systemui.pip.phone.PipMenuActivityController.MENU_STATE_NONE; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java index 56b83247a15e..46d53e410725 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java @@ -37,8 +37,10 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.util.Log; + import com.android.systemui.pip.phone.PipMediaController.ActionListener; import com.android.systemui.shared.system.InputConsumerController; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java index ce7da79de794..38583564f5b0 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java @@ -18,6 +18,7 @@ package com.android.systemui.pip.phone; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; + import static com.android.systemui.Interpolators.FAST_OUT_LINEAR_IN; import static com.android.systemui.Interpolators.FAST_OUT_SLOW_IN; import static com.android.systemui.Interpolators.LINEAR_OUT_SLOW_IN; @@ -42,11 +43,13 @@ import android.os.Message; import android.os.RemoteException; import android.util.Log; import android.view.animation.Interpolator; + import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.internal.os.SomeArgs; import com.android.internal.policy.PipSnapAlgorithm; import com.android.systemui.shared.system.WindowManagerWrapper; import com.android.systemui.statusbar.FlingAnimationUtils; + import java.io.PrintWriter; /** diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java index b9369d39dd51..9aa21f8270b3 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java @@ -18,7 +18,6 @@ package com.android.systemui.pip.phone; import android.graphics.PointF; import android.os.Handler; -import android.os.SystemClock; import android.util.Log; import android.view.MotionEvent; import android.view.VelocityTracker; diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java index 10206d492e3a..a40b72b30f22 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java @@ -16,7 +16,6 @@ package com.android.systemui.pip.tv; -import android.app.ActivityManager; import android.app.PendingIntent.CanceledException; import android.app.RemoteAction; import android.content.Context; @@ -24,20 +23,15 @@ import android.graphics.Color; import android.media.session.MediaController; import android.media.session.PlaybackState; import android.os.Handler; -import android.os.RemoteException; +import android.util.AttributeSet; import android.util.Log; -import android.view.View; import android.view.Gravity; import android.view.LayoutInflater; -import android.widget.ImageView; +import android.view.View; import android.widget.LinearLayout; -import android.util.AttributeSet; import com.android.systemui.R; -import static android.media.session.PlaybackState.ACTION_PAUSE; -import static android.media.session.PlaybackState.ACTION_PLAY; - import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java index e17e0bca56dc..ca3cdf4bee80 100755 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java @@ -49,6 +49,7 @@ import android.view.IPinnedStackController; import android.view.IPinnedStackListener; import android.view.IWindowManager; import android.view.WindowManagerGlobal; + import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.UiOffloadThread; @@ -56,7 +57,7 @@ import com.android.systemui.pip.BasePipManager; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.WindowManagerWrapper; -import java.io.PrintWriter; + import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java index e437eff28a08..3a5fa2253057 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java @@ -22,7 +22,6 @@ import android.app.Activity; import android.content.Intent; import android.content.pm.ParceledListSlice; import android.os.Bundle; -import android.view.View; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java index ac41b752020b..89ecc6abd623 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java @@ -26,17 +26,15 @@ import android.content.IntentFilter; import android.content.pm.ParceledListSlice; import android.content.res.Resources; import android.graphics.Bitmap; -import android.graphics.drawable.Icon; import android.media.MediaMetadata; import android.media.session.MediaController; import android.media.session.PlaybackState; import android.text.TextUtils; import android.util.Log; -import android.view.View; -import com.android.systemui.util.NotificationChannels; -import com.android.systemui.R; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; +import com.android.systemui.R; +import com.android.systemui.util.NotificationChannels; /** * A notification that informs users that PIP is running and also provides PIP controls. diff --git a/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java b/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java index 5686d801bca2..3f2417638f1a 100644 --- a/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java @@ -1,7 +1,5 @@ package com.android.systemui.power; -import android.util.Log; - public class EnhancedEstimatesImpl implements EnhancedEstimates { @Override diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 21eab592098d..b722f9f1d1c1 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -41,6 +41,7 @@ import android.text.style.URLSpan; import android.util.Log; import android.util.Slog; import android.view.View; + import androidx.annotation.VisibleForTesting; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt index 2f86f78d7669..5ce4ee738373 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt @@ -16,7 +16,6 @@ package com.android.systemui.privacy import android.content.Context import com.android.systemui.R -import java.lang.IllegalStateException import java.lang.Math.max class PrivacyDialogBuilder(val context: Context, itemsList: List<PrivacyItem>) { @@ -71,4 +70,4 @@ class PrivacyDialogBuilder(val context: Context, itemsList: List<PrivacyItem>) { fun generateTypesText() = itemsByType.keys.map { it.getName(context) }.sorted().joinToString() fun generateIcons() = itemsByType.keys.map { it.getIcon(context) } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/AlphaControlledSignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/AlphaControlledSignalTileView.java index 2c7ec70a5fff..6a6f5728fc5b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/AlphaControlledSignalTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/AlphaControlledSignalTileView.java @@ -19,6 +19,7 @@ package com.android.systemui.qs; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; + import com.android.systemui.qs.tileimpl.SlashImageView; diff --git a/packages/SystemUI/src/com/android/systemui/qs/AutoSizingList.java b/packages/SystemUI/src/com/android/systemui/qs/AutoSizingList.java index 767fd9efd4f0..1195184050e3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/AutoSizingList.java +++ b/packages/SystemUI/src/com/android/systemui/qs/AutoSizingList.java @@ -23,6 +23,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import android.widget.ListAdapter; + import com.android.systemui.R; /** diff --git a/packages/SystemUI/src/com/android/systemui/qs/CellTileView.java b/packages/SystemUI/src/com/android/systemui/qs/CellTileView.java index 376e6ae16cc8..c1aa7069d6ba 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/CellTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/CellTileView.java @@ -20,7 +20,6 @@ import android.service.quicksettings.Tile; import android.widget.ImageView; import com.android.settingslib.graph.SignalDrawable; -import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSTile.Icon; import com.android.systemui.plugins.qs.QSTile.State; diff --git a/packages/SystemUI/src/com/android/systemui/qs/DataUsageGraph.java b/packages/SystemUI/src/com/android/systemui/qs/DataUsageGraph.java index 6aad47927a15..afce69e7f2d0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/DataUsageGraph.java +++ b/packages/SystemUI/src/com/android/systemui/qs/DataUsageGraph.java @@ -18,7 +18,6 @@ package com.android.systemui.qs; import android.content.Context; import android.content.res.Resources; -import android.content.res.ColorStateList; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; diff --git a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java index aa2f8d171143..d5c5ba401e99 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java @@ -6,10 +6,10 @@ import android.content.res.TypedArray; import android.graphics.drawable.AnimatedVectorDrawable; import android.util.AttributeSet; import android.util.Log; -import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; + import com.android.systemui.R; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java index 1451e71e2df5..dbd304233601 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java @@ -23,14 +23,11 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.FrameLayout; import com.android.systemui.R; -import com.android.systemui.SysUiServiceProvider; import com.android.systemui.qs.customize.QSCustomizer; -import com.android.systemui.statusbar.CommandQueue; /** * Wrapper view with background which contains {@link QSPanel} and {@link BaseStatusBarHeader} diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java index ddd991023273..dab0efe10b5d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java @@ -32,6 +32,7 @@ import android.widget.BaseAdapter; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; + import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSTile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index 84eb3da51bcf..b597a72ba899 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -15,9 +15,10 @@ */ package com.android.systemui.qs; -import androidx.annotation.Nullable; import android.view.View; +import androidx.annotation.Nullable; + /** * The bottom footer of the quick settings panel. */ diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index f147fb3054b7..8903a38dc600 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -28,8 +28,6 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; @@ -40,6 +38,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.keyguard.CarrierText; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index f9971d83addc..953eb70cac5d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -22,8 +22,6 @@ import android.app.Fragment; import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; @@ -34,6 +32,9 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.FrameLayout.LayoutParams; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -42,9 +43,9 @@ import com.android.systemui.SysUiServiceProvider; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.customize.QSCustomizer; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.notification.stack.StackStateAnimator; import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer; import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler; -import com.android.systemui.statusbar.notification.stack.StackStateAnimator; public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks { private static final String TAG = "QS"; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index cf63e478312c..f1f0f698ab72 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -17,6 +17,7 @@ package com.android.systemui.qs; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; + import static com.android.systemui.qs.tileimpl.QSTileImpl.getColorForState; import android.annotation.Nullable; @@ -30,7 +31,6 @@ import android.os.Handler; import android.os.Message; import android.service.quicksettings.Tile; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java index 7ebab0bfce24..001cbbac5606 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java @@ -17,7 +17,6 @@ package com.android.systemui.qs; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Canvas; -import androidx.core.widget.NestedScrollView; import android.util.Property; import android.view.MotionEvent; import android.view.View; @@ -25,6 +24,8 @@ import android.view.ViewConfiguration; import android.view.ViewParent; import android.widget.LinearLayout; +import androidx.core.widget.NestedScrollView; + import com.android.systemui.R; import com.android.systemui.qs.touch.OverScroll; import com.android.systemui.qs.touch.SwipeDetector; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 8f3a7b3c04e9..e2e943a369c2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -33,8 +33,8 @@ import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.view.Window; import android.widget.ImageView; import android.widget.TextView; @@ -46,8 +46,6 @@ import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.SecurityController; -import static android.provider.Settings.ACTION_VPN_SETTINGS; - public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListener { protected static final String TAG = "QSSecurityFooter"; protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index cefeeb526968..d1c2df53b5a5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -31,14 +31,14 @@ import android.util.Log; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.PluginListener; -import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.plugins.qs.QSFactory; -import com.android.systemui.plugins.qs.QSTileView; import com.android.systemui.plugins.qs.QSTile; +import com.android.systemui.plugins.qs.QSTileView; import com.android.systemui.qs.external.CustomTile; import com.android.systemui.qs.external.TileLifecycleManager; import com.android.systemui.qs.external.TileServices; import com.android.systemui.qs.tileimpl.QSFactoryImpl; +import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.statusbar.phone.AutoTileManager; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java index f6b08b05bf38..0389030a17b2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java @@ -16,14 +16,14 @@ package com.android.systemui.qs.car; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; -import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java index 2d9e4d7fc22b..3e82c54dc811 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java @@ -22,14 +22,15 @@ import android.animation.ValueAnimator; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.GridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.GridLayoutManager; + import com.android.systemui.R; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.QSFooter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java index 9b225bb9f18b..083a7471c3c1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java @@ -16,11 +16,12 @@ package com.android.systemui.qs.car; import android.content.Context; import android.graphics.Color; import android.graphics.Rect; -import androidx.annotation.IdRes; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; +import androidx.annotation.IdRes; + import com.android.settingslib.Utils; import com.android.systemui.BatteryMeterView; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index dc17dd8fee63..64ad95c6eaea 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -20,13 +20,8 @@ import android.animation.Animator.AnimatorListener; import android.animation.AnimatorListenerAdapter; import android.content.Context; import android.content.res.Configuration; -import android.graphics.Point; import android.os.Bundle; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; -import android.util.Log; import android.util.TypedValue; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; @@ -37,6 +32,10 @@ import android.widget.LinearLayout; import android.widget.Toolbar; import android.widget.Toolbar.OnMenuItemClickListener; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.Utils; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index 15d2e66a82ce..a29e93a57c69 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -23,13 +23,6 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.ColorDrawable; import android.os.Handler; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ItemDecoration; -import androidx.recyclerview.widget.RecyclerView.State; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -39,6 +32,14 @@ import android.view.accessibility.AccessibilityManager; import android.widget.FrameLayout; import android.widget.TextView; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ItemDecoration; +import androidx.recyclerview.widget.RecyclerView.State; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index bb65bedd8aeb..89066651084d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -15,6 +15,9 @@ */ package com.android.systemui.qs.external; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; + import android.app.ActivityManager; import android.content.ComponentName; import android.content.Intent; @@ -41,13 +44,11 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.qs.QSTile.State; -import com.android.systemui.qs.tileimpl.QSTileImpl; -import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import com.android.systemui.qs.QSTileHost; -import java.util.Objects; +import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; +import com.android.systemui.qs.tileimpl.QSTileImpl; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; +import java.util.Objects; public class CustomTile extends QSTileImpl<State> implements TileChangeListener { public static final String PREFIX = "custom("; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java b/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java index 451e1f6ca827..2345667f0409 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java @@ -16,9 +16,7 @@ package com.android.systemui.qs.external; import android.os.IBinder; -import android.service.quicksettings.IQSService; import android.service.quicksettings.IQSTileService; -import android.service.quicksettings.Tile; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java index 75dd0d9e565d..1caab5aa77ef 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java @@ -18,7 +18,9 @@ package com.android.systemui.qs.external; import android.content.Context; import android.content.res.ColorStateList; import android.service.quicksettings.Tile; + import androidx.annotation.VisibleForTesting; + import com.android.systemui.R; public class TileColorPicker { diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java index 4e0f38fc4662..305fbf2e3e98 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java @@ -15,15 +15,14 @@ */ package com.android.systemui.qs.external; -import android.app.AppGlobals; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import android.content.ServiceConnection; import android.net.Uri; import android.os.Binder; import android.os.Handler; @@ -34,10 +33,10 @@ import android.service.quicksettings.IQSService; import android.service.quicksettings.IQSTileService; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import androidx.annotation.VisibleForTesting; import android.util.ArraySet; import android.util.Log; -import com.android.systemui.qs.external.PackageManagerAdapter; + +import androidx.annotation.VisibleForTesting; import java.util.Objects; import java.util.Set; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java index 9f9fe39bab6c..416c2da53606 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java @@ -30,9 +30,10 @@ import android.os.UserHandle; import android.service.quicksettings.IQSTileService; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java index ac7ef5dc308e..b2f60436fecd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java @@ -20,8 +20,11 @@ import android.util.Log; import android.view.ContextThemeWrapper; import com.android.systemui.R; -import com.android.systemui.plugins.qs.*; +import com.android.systemui.plugins.qs.QSFactory; +import com.android.systemui.plugins.qs.QSIconView; +import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTileView; +import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.external.CustomTile; import com.android.systemui.qs.tiles.AirplaneModeTile; import com.android.systemui.qs.tiles.BatterySaverTile; @@ -41,7 +44,6 @@ import com.android.systemui.qs.tiles.RotationLockTile; import com.android.systemui.qs.tiles.UserTile; import com.android.systemui.qs.tiles.WifiTile; import com.android.systemui.qs.tiles.WorkModeTile; -import com.android.systemui.qs.QSTileHost; import com.android.systemui.util.leak.GarbageMonitor; public class QSFactoryImpl implements QSFactory { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java index 9dd5d8fbc776..e2453128d4b0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java @@ -34,8 +34,8 @@ import com.android.systemui.R; import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTile.State; - import com.android.systemui.qs.AlphaControlledSignalTileView.AlphaControlledSlashImageView; + import java.util.Objects; public class QSIconViewImpl extends QSIconView { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java index a3e9afd366fd..72c68ce12ca4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java @@ -17,9 +17,10 @@ package com.android.systemui.qs.tileimpl; import android.annotation.Nullable; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; import android.widget.ImageView; +import androidx.annotation.NonNull; + import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.plugins.qs.QSTile.SlashState; import com.android.systemui.qs.SlashDrawable; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index cd0031173f8b..c62a592be8e2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -16,8 +16,6 @@ package com.android.systemui.qs.tiles; -import static com.android.settingslib.graph.BluetoothDeviceLayerDrawable.createLayerDrawable; - import android.annotation.Nullable; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index b93f1c208c11..c13a07fdd15e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -22,14 +22,13 @@ import android.provider.Settings.Secure; import android.service.quicksettings.Tile; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.R.drawable; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile.BooleanState; -import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.SecureSetting; +import com.android.systemui.qs.tileimpl.QSTileImpl; /** Quick settings tile: Invert colors **/ public class ColorInversionTile extends QSTileImpl<BooleanState> { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index ace361bdb4e6..fd8b9c9534dc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -18,6 +18,7 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.service.quicksettings.Tile; import android.widget.Switch; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.Prefs; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java index 7bcc6d7b93a9..55785586464f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java @@ -16,11 +16,10 @@ package com.android.systemui.qs.tiles; -import android.annotation.ColorInt; import android.content.Context; +import android.content.res.ColorStateList; import android.content.res.Configuration; import android.content.res.Resources; -import android.content.res.ColorStateList; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java index 3c565ef9d07f..a639a9525dd4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java @@ -29,13 +29,11 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.qs.QSHost; -import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTile.State; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import java.util.Arrays; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index d7f2a2642180..b5f2d005e8e4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -27,8 +27,8 @@ import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.R.drawable; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile.BooleanState; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.statusbar.policy.KeyguardMonitor; import com.android.systemui.statusbar.policy.LocationController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java index 9edd65e14bf2..a365e4c53b0d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java @@ -22,17 +22,15 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; import android.nfc.NfcAdapter; import android.provider.Settings; import android.service.quicksettings.Tile; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile.BooleanState; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; /** Quick settings tile: Enable/Disable NFC **/ diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index c41f087aa76b..938dc0be2d85 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -24,16 +24,17 @@ import android.content.Intent; import android.metrics.LogMaker; import android.provider.Settings; import android.service.quicksettings.Tile; -import androidx.annotation.StringRes; import android.text.TextUtils; import android.util.Log; import android.widget.Switch; +import androidx.annotation.StringRes; + import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile.BooleanState; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import java.text.DateFormat; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 28b047bad71d..634581638c32 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -19,17 +19,15 @@ package com.android.systemui.qs.tiles; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; - import android.provider.Settings; import android.service.quicksettings.Tile; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile.BooleanState; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.statusbar.policy.RotationLockController; import com.android.systemui.statusbar.policy.RotationLockController.RotationLockControllerCallback; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java index ad7d1b6b4689..64fe54aa656d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java @@ -30,7 +30,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.internal.util.ArrayUtils; -import com.android.settingslib.drawable.UserIconDrawable; import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.statusbar.phone.UserAvatarView; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java index bde1c98d023c..e5c51a66fafa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java @@ -24,9 +24,9 @@ import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.plugins.qs.DetailAdapter; -import com.android.systemui.qs.QSHost; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTile.State; +import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserSwitcherController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java b/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java index 911bea67b8b4..e7161e1deace 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java +++ b/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java @@ -19,12 +19,13 @@ import static android.view.MotionEvent.INVALID_POINTER_ID; import android.content.Context; import android.graphics.PointF; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.MotionEvent; import android.view.ViewConfiguration; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + /** * One dimensional scroll/drag/swipe gesture detector. * diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java index 661b958d4865..958695d3b2ee 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java @@ -31,6 +31,7 @@ import android.os.RemoteException; import android.util.Log; import android.view.Display; import android.widget.Toast; + import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 19f76759ead7..1b89324209de 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -17,9 +17,9 @@ package com.android.systemui.recents; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; +import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; -import static android.view.MotionEvent.ACTION_CANCEL; import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_SWIPE_UP; import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON; @@ -42,6 +42,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.util.Log; import android.view.MotionEvent; + import com.android.systemui.Dependency; import com.android.systemui.Dumpable; import com.android.systemui.Prefs; @@ -55,6 +56,7 @@ import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.policy.CallbackController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index de22d219d4aa..0702d74506fd 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -20,9 +20,11 @@ import android.content.ContentResolver; import android.content.res.Configuration; import android.graphics.Rect; import android.provider.Settings; + import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.statusbar.CommandQueue; + import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java index 8a04c11f551a..3efed3fe2c4d 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java @@ -18,7 +18,9 @@ package com.android.systemui.recents; import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; + import com.android.systemui.SysUiServiceProvider; + import java.io.PrintWriter; interface RecentsImplementation { diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java index af0ebdc1306a..34f3c606be62 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java @@ -19,16 +19,17 @@ package com.android.systemui.recents; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; -import static com.android.systemui.Prefs.Key.HAS_DISMISSED_RECENTS_QUICK_SCRUB_ONBOARDING_ONCE; import static com.android.systemui.Prefs.Key.DISMISSED_RECENTS_SWIPE_UP_ONBOARDING_COUNT; +import static com.android.systemui.Prefs.Key.HAS_DISMISSED_RECENTS_QUICK_SCRUB_ONBOARDING_ONCE; import static com.android.systemui.Prefs.Key.HAS_SEEN_RECENTS_QUICK_SCRUB_ONBOARDING; import static com.android.systemui.Prefs.Key.HAS_SEEN_RECENTS_SWIPE_UP_ONBOARDING; import static com.android.systemui.Prefs.Key.OVERVIEW_OPENED_COUNT; import static com.android.systemui.Prefs.Key.OVERVIEW_OPENED_FROM_HOME_COUNT; -import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE; import static com.android.systemui.shared.system.LauncherEventUtil.DISMISS; -import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_QUICK_SCRUB_ONBOARDING_TIP; +import static com.android.systemui.shared.system.LauncherEventUtil + .RECENTS_QUICK_SCRUB_ONBOARDING_TIP; import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_SWIPE_UP_ONBOARDING_TIP; +import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE; import android.annotation.StringRes; import android.annotation.TargetApi; @@ -45,9 +46,9 @@ import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.drawable.ShapeDrawable; import android.os.Build; +import android.os.RemoteException; import android.os.SystemProperties; import android.os.UserManager; -import android.os.RemoteException; import android.util.TypedValue; import android.view.Gravity; import android.view.LayoutInflater; @@ -64,6 +65,7 @@ import com.android.systemui.R; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; + import java.io.PrintWriter; import java.util.Collections; import java.util.HashSet; diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java index f92c50a93f69..216b9409521f 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java +++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java @@ -16,6 +16,9 @@ package com.android.systemui.recents; +import static com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE; +import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE; + import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.app.ActivityManager; @@ -50,9 +53,6 @@ import com.android.systemui.util.leak.RotationUtils; import java.util.ArrayList; -import static com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE; -import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE; - public class ScreenPinningRequest implements View.OnClickListener { private final Context mContext; diff --git a/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java b/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java index af8c2d08f4b4..ef4e19559f1f 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java +++ b/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java @@ -19,6 +19,7 @@ package com.android.systemui.recents; import android.graphics.Outline; import android.graphics.Path; import android.graphics.drawable.shapes.PathShape; + import androidx.annotation.NonNull; /** diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index 3ed5f70b8915..79228b9c369e 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -43,7 +43,6 @@ import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java index 2ae53b5d81fe..0374a013a90c 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java @@ -18,7 +18,6 @@ package com.android.systemui.settings; import android.app.Activity; import android.os.Bundle; -import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java index 64fa8f86c5f6..07675e248906 100644 --- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java @@ -26,6 +26,7 @@ import android.view.IWindowManager; import android.view.KeyEvent; import android.view.WindowManager; import android.view.WindowManagerGlobal; + import com.android.internal.policy.DividerSnapAlgorithm; import com.android.systemui.SystemUI; import com.android.systemui.recents.Recents; diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyServiceProxy.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyServiceProxy.java index 8ec862e1fdec..156964ac326d 100644 --- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyServiceProxy.java +++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyServiceProxy.java @@ -19,6 +19,7 @@ package com.android.systemui.shortcut; import android.os.Handler; import android.os.Message; import android.os.RemoteException; + import com.android.internal.policy.IShortcutService; /** diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index ea194a70adf2..cd2074fd64b8 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -26,9 +26,11 @@ import android.view.IDockedStackListener; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManagerGlobal; + import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.recents.Recents; + import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index fa01af68364e..7a7d1f6b1f04 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -55,6 +55,7 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; import android.widget.FrameLayout; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.DividerSnapAlgorithm; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerWindowManager.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerWindowManager.java index b7a5d31a324b..2486d6534e8d 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerWindowManager.java @@ -16,12 +16,6 @@ package com.android.systemui.stackdivider; -import android.content.Context; -import android.graphics.PixelFormat; -import android.os.Binder; -import android.view.View; -import android.view.WindowManager; - import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; @@ -32,6 +26,12 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; +import android.content.Context; +import android.graphics.PixelFormat; +import android.os.Binder; +import android.view.View; +import android.view.WindowManager; + /** * Manages the window parameters of the docked stack divider. */ diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/ForcedResizableInfoActivityController.java b/packages/SystemUI/src/com/android/systemui/stackdivider/ForcedResizableInfoActivityController.java index f66db48f441c..c6ac309a0f4e 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/ForcedResizableInfoActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/ForcedResizableInfoActivityController.java @@ -16,7 +16,8 @@ package com.android.systemui.stackdivider; -import static com.android.systemui.stackdivider.ForcedResizableInfoActivity.EXTRA_FORCED_RESIZEABLE_REASON; +import static com.android.systemui.stackdivider.ForcedResizableInfoActivity + .EXTRA_FORCED_RESIZEABLE_REASON; import android.app.ActivityOptions; import android.content.Context; @@ -25,6 +26,7 @@ import android.os.Handler; import android.os.UserHandle; import android.util.ArraySet; import android.widget.Toast; + import com.android.systemui.R; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java index 600964e98b84..228aab5e3eec 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java @@ -18,7 +18,6 @@ package com.android.systemui.stackdivider; import static android.view.WindowManager.DOCKED_INVALID; -import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.graphics.Rect; import android.os.RemoteException; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index 00e0b954d7be..7f39e474f6c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -62,11 +62,13 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; + import com.android.internal.app.AssistUtils; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.Utils; import com.android.systemui.R; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java index 1f576342d5cd..a188c5ae7538 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java @@ -40,7 +40,6 @@ import android.widget.ImageView; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.statusbar.phone.KeyguardAffordanceHelper; /** * An ImageView which does not have overlapping renderings commands and therefore does not need a diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java index cdb0514a2686..8642ca4c7d33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java @@ -17,14 +17,11 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.content.res.Resources.Theme; -import android.graphics.Canvas; -import android.graphics.ColorFilter; -import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.view.ContextThemeWrapper; import android.view.Gravity; + import com.android.settingslib.Utils; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLifetimeExtender.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLifetimeExtender.java index 62c21dc17386..ecd9814c3073 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLifetimeExtender.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLifetimeExtender.java @@ -1,9 +1,9 @@ package com.android.systemui.statusbar; -import com.android.systemui.statusbar.notification.NotificationData; - import androidx.annotation.NonNull; +import com.android.systemui.statusbar.notification.NotificationData; + /** * Interface for anything that may need to keep notifications managed even after * {@link NotificationListener} removes it. The lifetime extender is in charge of performing the diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java index 5c8f4cbf6078..0e9f950f54ed 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java @@ -16,11 +16,8 @@ package com.android.systemui.statusbar; import android.content.Intent; -import android.os.Handler; -import android.view.View; import com.android.systemui.statusbar.notification.ActivityLaunchAnimator; -import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java index 47b7fe9d7277..f42c6ef7356d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java @@ -22,10 +22,10 @@ import android.app.RemoteInput; import android.graphics.drawable.Icon; import android.text.TextUtils; -import com.android.systemui.statusbar.notification.NotificationData; - import androidx.annotation.VisibleForTesting; +import com.android.systemui.statusbar.notification.NotificationData; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java index 5090f74d4019..f1a891b95eaa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java @@ -15,10 +15,9 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.net.ConnectivityManager; import android.graphics.Rect; +import android.net.ConnectivityManager; import android.os.Bundle; -import android.provider.Settings; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.text.TextUtils; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java index 7f63191c9131..929f43e01c0f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java @@ -16,10 +16,6 @@ package com.android.systemui.statusbar; -import com.android.internal.util.Preconditions; -import com.android.systemui.statusbar.notification.NotificationData; -import com.android.systemui.statusbar.policy.RemoteInputView; - import android.app.Notification; import android.app.RemoteInput; import android.content.Context; @@ -27,6 +23,10 @@ import android.os.SystemProperties; import android.util.ArrayMap; import android.util.Pair; +import com.android.internal.util.Preconditions; +import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.policy.RemoteInputView; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java index 3bc434280c51..cb9060bc9574 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java @@ -28,16 +28,14 @@ import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuffColorFilter; -import android.graphics.PorterDuffXfermode; -import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.core.graphics.ColorUtils; import android.util.AttributeSet; import android.util.Log; import android.view.Display; import android.view.View; import android.view.WindowManager; -import android.view.animation.Interpolator; + +import androidx.core.graphics.ColorUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.colorextraction.ColorExtractor; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java b/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java index fb888ddc5f13..758c33a5aabe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java @@ -16,13 +16,11 @@ package com.android.systemui.statusbar; import android.os.RemoteException; -import android.service.notification.StatusBarNotification; import android.util.ArraySet; import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.Dependency; import com.android.systemui.statusbar.notification.NotificationData; -import com.android.systemui.statusbar.notification.NotificationEntryManager; import java.util.Set; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconContainer.java index 56f78f419275..065222762b33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconContainer.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar; import com.android.internal.statusbar.StatusBarIcon; + import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java index 3c52e8cab422..bc89889c48fe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java @@ -27,16 +27,14 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; - import android.widget.LinearLayout; + import com.android.internal.annotations.VisibleForTesting; -import com.android.keyguard.AlphaOptimizedLinearLayout; import com.android.settingslib.graph.SignalDrawable; import com.android.systemui.R; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java index f3fc99e36426..045221f510fa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java @@ -27,18 +27,14 @@ import android.content.res.ColorStateList; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.util.Log; import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; import android.widget.FrameLayout; import android.widget.ImageView; - import android.widget.LinearLayout; -import com.android.keyguard.AlphaOptimizedLinearLayout; + import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/UserUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/UserUtil.java index f9afc7c34668..c4fadff16c09 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/UserUtil.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/UserUtil.java @@ -16,12 +16,12 @@ package com.android.systemui.statusbar; -import com.android.systemui.statusbar.phone.SystemUIDialog; -import com.android.systemui.statusbar.policy.UserSwitcherController; import android.content.Context; import android.content.DialogInterface; import com.android.systemui.R; +import com.android.systemui.statusbar.phone.SystemUIDialog; +import com.android.systemui.statusbar.policy.UserSwitcherController; public class UserUtil { public static void deleteUserWithPrompt(Context context, int userId, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java index 46f88635be79..bd328567fb46 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java @@ -3,10 +3,8 @@ package com.android.systemui.statusbar.car; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java index 9ed092974963..81f7846b357d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java @@ -16,13 +16,10 @@ package com.android.systemui.statusbar.car; -import android.app.UiModeManager; import android.content.Context; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.LinearLayout; -import android.widget.TextView; import com.android.keyguard.AlphaOptimizedImageButton; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java index 0304086dbfda..f2923f7df248 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java @@ -1,5 +1,7 @@ package com.android.systemui.statusbar.car; +import static com.android.systemui.statusbar.phone.StatusBar.DEBUG; + import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHeadsetClient; @@ -9,21 +11,19 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.telephony.SignalStrength; import android.util.Log; import android.util.TypedValue; import android.view.View; import android.widget.ImageView; + import com.android.settingslib.graph.SignalDrawable; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.ScalingDrawableWrapper; import com.android.systemui.statusbar.policy.BluetoothController; -import static com.android.systemui.statusbar.phone.StatusBar.DEBUG; - /** * Controller that monitors signal strength for a device that is connected via bluetooth. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/SwitchToGuestTimer.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/SwitchToGuestTimer.java index f9fa44b17489..0c91cba43390 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/SwitchToGuestTimer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/SwitchToGuestTimer.java @@ -21,10 +21,10 @@ import android.content.Context; import android.os.CountDownTimer; import android.util.Log; -import com.android.systemui.R; - import androidx.annotation.GuardedBy; +import com.android.systemui.R; + /** * Wrapper for a countdown timer that switches to Guest if the user has been driving with * the keyguard up for configurable number of seconds. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java index 53a7afe76d0d..d802ed8d6e3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java @@ -29,7 +29,6 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.graphics.Bitmap; import android.os.AsyncTask; -import android.os.UserHandle; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -44,8 +43,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.util.UserIcons; import com.android.systemui.R; - import com.android.systemui.statusbar.phone.SystemUIDialog; + import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActionListTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActionListTransformState.java index 8c725446a3cb..6044a7e16b61 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActionListTransformState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActionListTransformState.java @@ -16,11 +16,7 @@ package com.android.systemui.statusbar.notification; -import android.text.Layout; -import android.text.TextUtils; import android.util.Pools; -import android.view.View; -import android.widget.TextView; /** * A transform state of the action list diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/CustomInterpolatorTransformation.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/CustomInterpolatorTransformation.java index de4c3128e99f..dea1a07c0268 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/CustomInterpolatorTransformation.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/CustomInterpolatorTransformation.java @@ -17,16 +17,11 @@ package com.android.systemui.statusbar.notification; import android.view.View; -import android.view.animation.Interpolator; -import com.android.systemui.Interpolators; import com.android.systemui.statusbar.CrossFadeHelper; import com.android.systemui.statusbar.TransformableView; import com.android.systemui.statusbar.ViewTransformationHelper; -import static com.android.systemui.statusbar.TransformableView.TRANSFORMING_VIEW_TITLE; -import static com.android.systemui.statusbar.notification.TransformState.TRANSFORM_Y; - /** * A custom transformation that modifies the interpolator */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageGradientColorizer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageGradientColorizer.java index 454edbb1a037..f5a76f0499e2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageGradientColorizer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ImageGradientColorizer.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.notification; import android.graphics.Bitmap; -import android.graphics.BitmapShader; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorMatrix; @@ -27,7 +26,6 @@ import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Shader; -import android.graphics.Xfermode; import android.graphics.drawable.Drawable; /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java index 8c0d70062eb1..ab94008d656a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java @@ -23,9 +23,10 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; +import android.util.LayoutDirection; + import androidx.annotation.VisibleForTesting; import androidx.palette.graphics.Palette; -import android.util.LayoutDirection; import com.android.internal.util.ContrastColorUtil; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingImageTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingImageTransformState.java index b97995dd5f93..a3fb2251f5aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingImageTransformState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingImageTransformState.java @@ -20,7 +20,6 @@ import android.util.Pools; import android.view.View; import com.android.internal.widget.MessagingImageMessage; -import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.statusbar.ViewTransformationHelper; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java index 07b8c3558304..337f31295308 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java @@ -29,9 +29,9 @@ import com.android.internal.widget.ViewClippingUtil; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.statusbar.CrossFadeHelper; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.TransformableView; import com.android.systemui.statusbar.ViewTransformationHelper; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; /** * A transform state of a view. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java index da8954ae4c03..75613a42eb5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java @@ -16,9 +16,10 @@ package com.android.systemui.statusbar.notification; -import androidx.collection.ArraySet; import android.view.View; +import androidx.collection.ArraySet; + import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java index 1a4ef0914664..16796dd86e18 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java @@ -16,10 +16,13 @@ package com.android.systemui.statusbar.notification.row; +import static android.service.notification.NotificationListenerService.Ranking + .USER_SENTIMENT_NEGATIVE; + import android.content.Context; +import android.util.Log; import androidx.annotation.VisibleForTesting; -import android.util.Log; import com.android.internal.logging.MetricsLogger; import com.android.systemui.Dependency; @@ -31,8 +34,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE; - /** * Manager for the notification blocking helper - tracks and helps create the blocking helper * affordance. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java index 75b05c26886d..d65f2c53598c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java @@ -16,16 +16,6 @@ package com.android.systemui.statusbar.notification.row; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; -import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -53,8 +43,17 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Interpolators; import com.android.systemui.R; +import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; +import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; public class NotificationSnooze extends LinearLayout implements NotificationGuts.GutsContent, View.OnClickListener { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowInflaterTask.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowInflaterTask.java index a21794bc4835..1741a0b6b37c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowInflaterTask.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowInflaterTask.java @@ -17,11 +17,12 @@ package com.android.systemui.statusbar.notification.row; import android.content.Context; -import androidx.asynclayoutinflater.view.AsyncLayoutInflater; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import androidx.asynclayoutinflater.view.AsyncLayoutInflater; + import com.android.systemui.R; import com.android.systemui.statusbar.InflationTask; import com.android.systemui.statusbar.notification.NotificationData; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java index 8a061a606099..1b40c06a5867 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java @@ -24,7 +24,6 @@ import android.view.animation.Interpolator; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.Interpolators; -import com.android.systemui.statusbar.notification.row.ExpandableView; /** * A common base class for all views in the notification stack scroller which don't have a diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java index 133df3c154de..4261df3dab27 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java @@ -21,8 +21,8 @@ import android.service.notification.StatusBarNotification; import android.view.View; import com.android.internal.widget.ImageFloatingTextView; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.TransformableView; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; /** * Wraps a notification containing a big text template diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java index 6ca07ed8b161..a8ced7a01d84 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java @@ -16,9 +16,9 @@ package com.android.systemui.statusbar.notification.row.wrapper; +import static com.android.systemui.statusbar.notification.TransformState.TRANSFORM_Y; import static com.android.systemui.statusbar.notification.row.ExpandableNotificationRow .DEFAULT_HEADER_VISIBLE_AMOUNT; -import static com.android.systemui.statusbar.notification.TransformState.TRANSFORM_Y; import android.app.Notification; import android.content.Context; @@ -34,12 +34,12 @@ import android.widget.TextView; import com.android.internal.widget.NotificationExpandButton; import com.android.systemui.Interpolators; import com.android.systemui.R; +import com.android.systemui.statusbar.TransformableView; +import com.android.systemui.statusbar.ViewTransformationHelper; import com.android.systemui.statusbar.notification.CustomInterpolatorTransformation; import com.android.systemui.statusbar.notification.ImageTransformState; import com.android.systemui.statusbar.notification.TransformState; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.TransformableView; -import com.android.systemui.statusbar.ViewTransformationHelper; import java.util.Stack; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java index 37d2f6bba7ff..5a9a56865a5c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java @@ -19,8 +19,8 @@ package com.android.systemui.statusbar.notification.row.wrapper; import android.content.Context; import android.view.View; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.TransformableView; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; /** * Wraps a notification containing a media template diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java index 13c596023f95..c9a274294d16 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMessagingTemplateViewWrapper.java @@ -16,15 +16,15 @@ package com.android.systemui.statusbar.notification.row.wrapper; +import android.content.Context; +import android.view.View; + import com.android.internal.widget.MessagingLayout; import com.android.internal.widget.MessagingLinearLayout; import com.android.systemui.R; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import android.content.Context; -import android.view.View; - /** * Wraps a notification containing a messaging template */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java index d934902b96e8..ff5e15bfe751 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java @@ -37,11 +37,11 @@ import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.UiOffloadThread; import com.android.systemui.statusbar.CrossFadeHelper; +import com.android.systemui.statusbar.TransformableView; +import com.android.systemui.statusbar.ViewTransformationHelper; import com.android.systemui.statusbar.notification.ImageTransformState; import com.android.systemui.statusbar.notification.TransformState; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.TransformableView; -import com.android.systemui.statusbar.ViewTransformationHelper; import com.android.systemui.statusbar.notification.row.HybridNotificationView; /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java index f76284dd1ffc..1efdc56874f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java @@ -24,9 +24,9 @@ import android.view.NotificationHeaderView; import android.view.View; import com.android.systemui.statusbar.CrossFadeHelper; +import com.android.systemui.statusbar.TransformableView; import com.android.systemui.statusbar.notification.TransformState; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.TransformableView; /** * Wraps the actual notification content view; used to implement behaviors which are different for diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AnimationFilter.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AnimationFilter.java index c6f953c8a6ae..ba56a943f559 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AnimationFilter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AnimationFilter.java @@ -16,10 +16,11 @@ package com.android.systemui.statusbar.notification.stack; -import androidx.collection.ArraySet; import android.util.Property; import android.view.View; +import androidx.collection.ArraySet; + import java.util.ArrayList; /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java index da089b307850..74b4aa2a7057 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java @@ -33,13 +33,13 @@ import android.widget.TextView; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; import com.android.systemui.statusbar.CrossFadeHelper; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationHeaderUtil; +import com.android.systemui.statusbar.notification.NotificationUtils; +import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.HybridGroupManager; import com.android.systemui.statusbar.notification.row.HybridNotificationView; -import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper; -import com.android.systemui.statusbar.notification.VisualStabilityManager; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java index cfb6d990a9a7..4d100a46c48a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java @@ -16,17 +16,18 @@ package com.android.systemui.statusbar.notification.stack; -import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters; +import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator + .ExpandAnimationParameters; import android.view.View; import android.view.ViewGroup; import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; +import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.VisibilityLocationProvider; +import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; -import com.android.systemui.statusbar.notification.NotificationData; -import com.android.systemui.statusbar.notification.logging.NotificationLogger; /** * Interface representing the entity that contains notifications. It can have diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 7bd582031e4a..a7329b0f181a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -5786,7 +5786,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd @Override public boolean canChildBeDismissedInDirection(View v, boolean isRightOrDown) { - return (isLayoutRtl() ? !isRightOrDown : isRightOrDown) && canChildBeDismissed(v); + boolean isValidDirection; + if (NotificationUtils.useNewInterruptionModel(mContext)) { + isValidDirection = isLayoutRtl() ? !isRightOrDown : isRightOrDown; + } else { + isValidDirection = true; + } + return isValidDirection && canChildBeDismissed(v); } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java index da3fb66ec1db..a94401b6319c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java @@ -26,10 +26,10 @@ import android.view.animation.Interpolator; import com.android.keyguard.KeyguardSliceView; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.StatusBarIconView; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; +import com.android.systemui.statusbar.notification.row.ExpandableView; import java.util.ArrayList; import java.util.HashSet; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java index a15fd7083017..b00068cd2445 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java @@ -28,9 +28,9 @@ import android.view.animation.Interpolator; import com.android.systemui.Dumpable; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; +import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.policy.HeadsUpUtil; import java.io.FileDescriptor; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java index ab58660f6ed6..d5056b75a383 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.os.Handler; import android.provider.Settings.Secure; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ColorDisplayController; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java index c32dcea1f646..3d814732a2e7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.phone; -import android.app.ActivityManager; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; @@ -25,9 +24,9 @@ import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.PorterDuff; +import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; -import android.graphics.PorterDuff.Mode; import android.graphics.drawable.Drawable; import android.os.SystemClock; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index 8325bf8085bd..302d630eeb2b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -16,18 +16,18 @@ package com.android.systemui.statusbar.phone; -import android.hardware.biometrics.BiometricSourceType; import android.content.Context; +import android.hardware.biometrics.BiometricSourceType; import android.os.Handler; import android.os.PowerManager; import android.os.SystemClock; import android.os.Trace; import android.util.Log; +import com.android.internal.util.LatencyTracker; import com.android.keyguard.KeyguardConstants; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.internal.util.LatencyTracker; import com.android.systemui.Dependency; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java index 119f01adddf8..4ced702f479e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java @@ -21,8 +21,8 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.view.View; - import android.view.View.AccessibilityDelegate; + import com.android.systemui.plugins.statusbar.phone.NavBarButtonProvider.ButtonInterface; import com.android.systemui.statusbar.policy.KeyButtonDrawable; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java index 970304399b67..cc8adde2ed04 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone; import android.annotation.IdRes; import android.annotation.NonNull; import android.view.View; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java index e052e531ddd2..3425dd237430 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java @@ -24,20 +24,20 @@ import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; import android.widget.LinearLayout; import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.DemoMode; import com.android.systemui.R; -import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.StatusBarMobileView; import com.android.systemui.statusbar.StatusBarWifiView; +import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; import com.android.systemui.statusbar.policy.DarkIconDispatcher; import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver; + import java.util.ArrayList; public class DemoStatusIcons extends StatusIconContainer implements DemoMode, DarkReceiver { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java index 8f49c85b0938..efc289185cfa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java @@ -18,6 +18,7 @@ import android.content.Context; import android.graphics.drawable.AnimatedVectorDrawable; import android.util.AttributeSet; import android.widget.ImageView; + import com.android.systemui.R; public class ExpandableIndicator extends ImageView { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java index c66bbb1696ac..40f9f45bf8bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java @@ -26,12 +26,12 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.CrossFadeHelper; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.HeadsUpStatusBarView; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.policy.DarkIconDispatcher; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index 976327a49f58..d05893d55508 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java @@ -21,8 +21,6 @@ import android.annotation.Nullable; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import androidx.collection.ArraySet; - import android.graphics.Rect; import android.graphics.Region; import android.graphics.Region.Op; @@ -33,16 +31,18 @@ import android.view.Gravity; import android.view.View; import android.view.ViewTreeObserver; +import androidx.collection.ArraySet; + import com.android.systemui.Dependency; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.ScreenDecorations; import com.android.systemui.statusbar.StatusBarState; +import com.android.systemui.statusbar.StatusBarStateController; import com.android.systemui.statusbar.StatusBarStateController.StateListener; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.NotificationData; -import com.android.systemui.statusbar.StatusBarStateController; import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java index e4a5caaf7d71..be4df458ecb9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java @@ -21,10 +21,9 @@ import android.view.MotionEvent; import android.view.ViewConfiguration; import com.android.systemui.Gefingerpoken; +import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; -import com.android.systemui.statusbar.notification.NotificationData; -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; /** * A helper class to handle touches on the heads-up views. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index 235629bbb509..c0d1818d8da9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -16,8 +16,8 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.plugins.ActivityStarter.OnDismissAction; import static com.android.keyguard.KeyguardSecurityModel.SecurityMode; +import static com.android.systemui.plugins.ActivityStarter.OnDismissAction; import android.content.Context; import android.content.res.ColorStateList; @@ -268,6 +268,8 @@ public class KeyguardBouncer { } public void hide(boolean destroyView) { + // TODO(b/113914868): investigation log for disappearing home button + Log.i(TAG, "KeyguardBouncer.hide (b/113914868): destroyView=" + destroyView); if (isShowing()) { StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java index 8cace7206a1f..e0c5516417ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java @@ -16,7 +16,9 @@ package com.android.systemui.statusbar.phone; -import android.app.WallpaperColors; +import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT; +import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT; + import android.content.Context; import android.graphics.Color; import android.graphics.Rect; @@ -32,9 +34,6 @@ import com.android.systemui.statusbar.policy.DarkIconDispatcher; import java.io.FileDescriptor; import java.io.PrintWriter; -import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT; -import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT; - /** * Controls how light status bar flag applies to the icons. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java index 27798203e4fe..7621887b4170 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone; import android.metrics.LogMaker; import android.util.ArrayMap; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java index 673cdb7c78ac..d2023ec49ebc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.IWallpaperManager; import android.app.IWallpaperManagerCallback; +import android.app.WallpaperColors; import android.app.WallpaperManager; import android.content.Context; import android.content.res.Resources; @@ -36,7 +37,6 @@ import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.app.WallpaperColors; import android.util.Log; import com.android.keyguard.KeyguardUpdateMonitor; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java index 22b6ba6fbb25..7c31dae2a746 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java @@ -14,6 +14,8 @@ package com.android.systemui.statusbar.phone; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; + import android.annotation.Nullable; import android.content.Context; import android.content.res.Configuration; @@ -34,11 +36,11 @@ import android.widget.LinearLayout; import android.widget.Space; import com.android.systemui.Dependency; -import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.R; import com.android.systemui.plugins.PluginListener; -import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.plugins.statusbar.phone.NavBarButtonProvider; +import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.statusbar.phone.ReverseLinearLayout.ReverseRelativeLayout; import com.android.systemui.statusbar.policy.KeyButtonView; import com.android.systemui.tuner.TunerService; @@ -48,8 +50,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; - public class NavigationBarInflaterView extends FrameLayout implements Tunable, PluginListener<NavBarButtonProvider> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java index d58b5543221e..12a0cc882a81 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java @@ -26,7 +26,6 @@ import android.view.IWallpaperVisibilityListener; import android.view.IWindowManager; import android.view.MotionEvent; import android.view.View; -import android.view.View.OnLayoutChangeListener; import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index b43bbdc2ca0d..2f58ca1c984b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -17,10 +17,15 @@ package com.android.systemui.statusbar.phone; import static android.view.MotionEvent.ACTION_DOWN; + +import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_QUICK_SCRUB; +import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON; import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_BACK; import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_DEAD_ZONE; import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_HOME; import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE; +import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_OVERVIEW; +import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_ROTATION; import android.animation.LayoutTransition; import android.animation.LayoutTransition.TransitionListener; @@ -60,15 +65,15 @@ import android.widget.FrameLayout; import com.android.systemui.Dependency; import com.android.systemui.DockedStackExistsListener; import com.android.systemui.Interpolators; -import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; import com.android.systemui.plugins.PluginListener; -import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.plugins.statusbar.phone.NavGesture; import com.android.systemui.plugins.statusbar.phone.NavGesture.GestureHelper; +import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsOnboarding; +import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.NavigationBarCompat; import com.android.systemui.shared.system.WindowManagerWrapper; @@ -79,11 +84,6 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.function.Consumer; -import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_QUICK_SCRUB; -import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON; -import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_OVERVIEW; -import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_ROTATION; - public class NavigationBarView extends FrameLayout implements PluginListener<NavGesture> { final static boolean DEBUG = false; final static String TAG = "StatusBar/NavBarView"; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java index 593bfae2aa4c..83067f6cff87 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java @@ -26,7 +26,6 @@ import android.content.Context; import android.graphics.Canvas; import android.view.MotionEvent; -import android.view.WindowManagerPolicyConstants; import com.android.systemui.recents.OverviewProxyService; /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java index 1524f806f871..2a11c2676b0c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java @@ -16,17 +16,14 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.content.res.Configuration; -import android.graphics.Rect; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; -import android.util.Log; import android.util.Pair; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.android.systemui.R; +import androidx.annotation.VisibleForTesting; import java.util.ArrayList; import java.util.Comparator; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java index e7ede6f626ba..ca762cdf07f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java @@ -20,7 +20,6 @@ import android.app.Fragment; import android.content.Context; import android.content.res.Configuration; import android.graphics.Canvas; -import androidx.annotation.DimenRes; import android.util.AttributeSet; import android.view.View; import android.view.ViewStub; @@ -28,6 +27,8 @@ import android.view.ViewStub.OnInflateListener; import android.view.WindowInsets; import android.widget.FrameLayout; +import androidx.annotation.DimenRes; + import com.android.systemui.R; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentHostManager.FragmentListener; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java index deac669e31d8..65b0ecc00953 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java @@ -22,7 +22,6 @@ import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; -import android.view.View; import android.widget.FrameLayout; public abstract class PanelBar extends FrameLayout { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubAction.java index c64e12478098..74744f1408fb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubAction.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubAction.java @@ -34,7 +34,6 @@ import android.graphics.RadialGradient; import android.graphics.Rect; import android.graphics.Shader; import android.os.RemoteException; - import android.util.FloatProperty; import android.util.Log; import android.view.MotionEvent; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java index 37c4c58a3bd9..0eff4d4adff5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java @@ -42,10 +42,10 @@ import android.view.ViewPropertyAnimator; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; -import com.android.systemui.plugins.statusbar.phone.NavGesture.GestureHelper; import com.android.systemui.R; -import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.plugins.statusbar.phone.NavGesture.GestureHelper; +import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.utilities.Utilities; import com.android.systemui.shared.system.NavigationBarCompat; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java index c6e98e0cfeb3..a7b8eff959c2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java @@ -39,10 +39,10 @@ import android.view.Surface; import android.view.View; import android.view.WindowManagerGlobal; -import com.android.systemui.Dependency; -import com.android.systemui.Interpolators; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.Dependency; +import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java index 2a5028bbe181..f8731b4980d9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.os.SystemClock; import android.util.Slog; -import android.view.WindowManager; import android.widget.Toast; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 1bed26dd3474..9f34cbb23131 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -23,7 +23,6 @@ import android.app.AlarmManager; import android.app.WallpaperManager; import android.content.Context; import android.graphics.Color; -import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Trace; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeController.java index e546119968aa..f9262186968f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeController.java @@ -15,6 +15,7 @@ package com.android.systemui.statusbar.phone; import android.view.View; + import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 12fbf2d979f4..a6a9d74a894c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -342,7 +342,8 @@ public class StatusBar extends SystemUI implements DemoMode, private int mStatusBarWindowState = WINDOW_STATE_SHOWING; protected StatusBarWindowController mStatusBarWindowController; protected UnlockMethodCache mUnlockMethodCache; - private DozeServiceHost mDozeServiceHost = new DozeServiceHost(); + @VisibleForTesting + DozeServiceHost mDozeServiceHost = new DozeServiceHost(); private boolean mWakeUpComingFromTouch; private PointF mWakeUpTouchLocation; @@ -479,7 +480,7 @@ public class StatusBar extends SystemUI implements DemoMode, private boolean mLaunchCameraOnScreenTurningOn; private boolean mLaunchCameraOnFinishedGoingToSleep; private int mLastCameraLaunchSource; - private PowerManager.WakeLock mGestureWakeLock; + protected PowerManager.WakeLock mGestureWakeLock; private Vibrator mVibrator; private long[] mCameraLaunchGestureVibePattern; @@ -3609,6 +3610,7 @@ public class StatusBar extends SystemUI implements DemoMode, } } + @VisibleForTesting final WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() { @Override public void onFinishedGoingToSleep() { @@ -3650,6 +3652,7 @@ public class StatusBar extends SystemUI implements DemoMode, mNotificationPanel.setTouchAndAnimationDisabled(false); updateVisibleToUser(); updateIsKeyguard(); + mDozeServiceHost.stopDozing(); } }; @@ -3856,7 +3859,8 @@ public class StatusBar extends SystemUI implements DemoMode, return mStatusBarKeyguardViewManager.isShowing(); } - private final class DozeServiceHost implements DozeHost { + @VisibleForTesting + final class DozeServiceHost implements DozeHost { private final ArrayList<Callback> mCallbacks = new ArrayList<>(); private boolean mAnimateWakeup; private boolean mAnimateScreenOff; @@ -3944,7 +3948,6 @@ public class StatusBar extends SystemUI implements DemoMode, mDozingRequested = false; DozeLog.traceDozing(mContext, mDozing); updateDozing(); - mWakefulnessLifecycle.dispatchStartedWakingUp(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 0d6cb5c50077..26c9d288494d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -16,16 +16,15 @@ package com.android.systemui.statusbar.phone; import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; import static android.app.StatusBarManager.DISABLE_NONE; + import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_ICON; import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_MOBILE; import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_WIFI; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; -import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; @@ -33,19 +32,22 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; +import androidx.annotation.VisibleForTesting; + import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.DemoMode; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.StatusBarMobileView; import com.android.systemui.statusbar.StatusBarWifiView; +import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; import com.android.systemui.statusbar.policy.DarkIconDispatcher; import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver; import com.android.systemui.util.Utils.DisableStateTracker; + import java.util.List; public interface StatusBarIconController { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java index 24a589665600..7c17c018443e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java @@ -45,8 +45,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import static com.android.systemui.statusbar.phone.StatusBarIconController.TAG_PRIMARY; - /** * Receives the callbacks from CommandQueue related to icons and tracks the state of * all the icons. Dispatches this state to any IconManagers that are currently diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.java index c4ff85fb7984..88d0035b333d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.content.Context; import android.graphics.drawable.Icon; import android.os.UserHandle; + import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java index b7e1cfb0097b..2e4161787267 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java @@ -16,16 +16,17 @@ package com.android.systemui.statusbar.phone; +import static com.android.systemui.statusbar.phone.StatusBarIconController.TAG_PRIMARY; + import android.annotation.NonNull; import android.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.statusbar.StatusBarIcon; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import static com.android.systemui.statusbar.phone.StatusBarIconController.TAG_PRIMARY; - public class StatusBarIconList { private ArrayList<Slot> mSlots = new ArrayList<>(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index f81ffe9ecb76..8286d26e9999 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -17,29 +17,20 @@ package com.android.systemui.statusbar.phone; import android.content.Context; -import android.content.res.ColorStateList; -import android.graphics.Rect; import android.os.Handler; -import android.os.Looper; import android.telephony.SubscriptionInfo; import android.util.ArraySet; import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityEvent; -import android.widget.ImageView; -import com.android.settingslib.graph.SignalDrawable; + import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.statusbar.phone.StatusBarIconController; -import com.android.systemui.statusbar.policy.DarkIconDispatcher; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkControllerImpl; import com.android.systemui.statusbar.policy.SecurityController; import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index ad9b9b30fafc..978a72dcb4b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -33,7 +33,6 @@ import android.media.AudioManager; import android.media.session.MediaSessionLegacyHelper; import android.net.Uri; import android.os.Bundle; -import android.os.IBinder; import android.os.SystemClock; import android.util.AttributeSet; import android.view.ActionMode; @@ -50,8 +49,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.Window; -import android.view.WindowManager; -import android.view.WindowManagerGlobal; import android.widget.FrameLayout; import com.android.internal.annotations.VisibleForTesting; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java index 56a177eb15fe..6495910359bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java @@ -16,9 +16,9 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON; import static com.android.systemui.statusbar.StatusBarIconView.STATE_DOT; import static com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN; +import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON; import android.annotation.Nullable; import android.content.Context; @@ -28,14 +28,15 @@ import android.graphics.Paint; import android.graphics.Paint.Style; import android.util.AttributeSet; import android.util.Log; - import android.view.View; + import com.android.keyguard.AlphaOptimizedLinearLayout; import com.android.systemui.R; import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.notification.stack.AnimationFilter; import com.android.systemui.statusbar.notification.stack.AnimationProperties; import com.android.systemui.statusbar.notification.stack.ViewState; + import java.util.ArrayList; /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java index e5925f07017f..bdd76c8ea05a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java @@ -16,8 +16,8 @@ package com.android.systemui.statusbar.phone; -import android.hardware.biometrics.BiometricSourceType; import android.content.Context; +import android.hardware.biometrics.BiometricSourceType; import android.os.Trace; import com.android.internal.widget.LockPatternUtils; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java index 2ed2edb969bd..ba55f2ddcf13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.Bitmap; -import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java index b76d536150eb..e1bb19a6f69f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java @@ -19,6 +19,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.telephony.SubscriptionInfo; + import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.statusbar.policy.NetworkController.EmergencyListener; import com.android.systemui.statusbar.policy.NetworkController.IconState; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java index 533bd86dbf5e..ccfe073d5cb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.policy; +import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY; + import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -30,6 +32,8 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.annotations.GuardedBy; import com.android.systemui.R; @@ -40,10 +44,6 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY; - -import androidx.annotation.VisibleForTesting; - /** Platform implementation of the cast controller. **/ public class CastControllerImpl implements CastController { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverControllerImpl.java index 2ede327ab698..911715fdba63 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverControllerImpl.java @@ -21,8 +21,6 @@ import android.os.Handler; import android.os.Looper; import android.os.RemoteException; -import com.android.systemui.statusbar.policy.DataSaverController.Listener; - import java.util.ArrayList; public class DataSaverControllerImpl implements DataSaverController { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java index dcce77c7c355..74a30fa8094f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java @@ -27,7 +27,6 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; -import com.android.settingslib.Utils; import com.android.systemui.Dependency; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedController.java index cae76b492527..7b4c35a8d25a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedController.java @@ -14,8 +14,6 @@ package com.android.systemui.statusbar.policy; -import android.content.Context; - import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; public interface DeviceProvisionedController extends CallbackController<DeviceProvisionedListener> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java index c7261899a786..0d6178b1176b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java @@ -23,13 +23,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.provider.Settings; -import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; -import android.view.ViewGroup; -import android.view.ViewParent; import android.widget.TextView; import com.android.internal.telephony.IccCardConstants; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java index 11fc40804f71..e23ce2d022b3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java @@ -30,8 +30,6 @@ import android.provider.Settings.Secure; import android.text.TextUtils; import android.util.Log; -import com.android.systemui.statusbar.policy.FlashlightController.FlashlightListener; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.lang.ref.WeakReference; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java index b4d24d16113e..6b83b70b0ca5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java @@ -16,22 +16,23 @@ package com.android.systemui.statusbar.policy; -import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP; +import static com.android.systemui.statusbar.notification.row.NotificationInflater + .FLAG_CONTENT_VIEW_HEADS_UP; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.content.res.Resources; import android.database.ContentObserver; -import android.util.ArrayMap; import android.provider.Settings; +import android.util.ArrayMap; import android.util.Log; import com.android.internal.logging.MetricsLogger; import com.android.systemui.R; import com.android.systemui.statusbar.AlertingNotificationManager; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java index 5fd79a4bb342..aee021ce4688 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java @@ -23,9 +23,10 @@ import android.content.Context; import android.metrics.LogMaker; import android.os.Handler; import android.os.Looper; -import androidx.annotation.VisibleForTesting; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.MetricsLogger; import java.util.Arrays; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java index 2340786d81fb..03c89c60360f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java @@ -37,6 +37,7 @@ import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; import android.util.FloatProperty; import android.view.ContextThemeWrapper; + import com.android.settingslib.Utils; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java index 59bd85eaabd4..8b869969e215 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java @@ -25,9 +25,9 @@ import android.graphics.CanvasProperty; import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; +import android.graphics.RecordingCanvas; import android.graphics.drawable.Drawable; import android.os.Handler; -import android.graphics.RecordingCanvas; import android.view.RenderNodeAnimator; import android.view.View; import android.view.ViewConfiguration; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 6fa73ef62447..2c756ceb1b48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -45,12 +45,13 @@ import android.view.ViewConfiguration; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; -import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.R; import com.android.systemui.plugins.statusbar.phone.NavBarButtonProvider.ButtonInterface; +import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.shared.system.NavigationBarCompat; public class KeyButtonView extends ImageView implements ButtonInterface { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java index fcd7e0953825..840e77ea85a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java @@ -29,12 +29,14 @@ import android.location.LocationManager; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.os.Process; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; + import com.android.systemui.util.Utils; + import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 8ca14152f080..e943261bda7b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -35,8 +35,8 @@ import android.util.SparseArray; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.cdma.EriInfo; -import com.android.settingslib.graph.SignalDrawable; import com.android.settingslib.Utils; +import com.android.settingslib.graph.SignalDrawable; import com.android.systemui.R; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java index dfdeae1fc497..dac878c69313 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java @@ -23,8 +23,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.UserHandle; -import com.android.systemui.statusbar.policy.NextAlarmController.NextAlarmChangeCallback; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/OnHeadsUpChangedListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/OnHeadsUpChangedListener.java index 5028fd1cec9e..d43476885979 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/OnHeadsUpChangedListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/OnHeadsUpChangedListener.java @@ -16,8 +16,8 @@ package com.android.systemui.statusbar.policy; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; /** * A listener to heads up changes diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 7dd0d0fbef47..a485fa89ebe8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -55,8 +55,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.RemoteInputController; +import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper; import com.android.systemui.statusbar.notification.stack.StackStateAnimator; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java index 91c208d571f5..9ec30d43ac75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java @@ -15,16 +15,17 @@ */ package com.android.systemui.statusbar.policy; +import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG; + import android.content.Context; import android.text.format.DateFormat; import android.util.Log; + import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; import java.io.PrintWriter; import java.util.BitSet; -import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG; - /** * Common base class for handling signal for both wifi and mobile data. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java index 7b0b80049966..71d6e5421b75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.policy; -import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.database.ContentObserver; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java index aa4782fd864a..42f1378a15dc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java @@ -28,11 +28,11 @@ import android.widget.Button; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ContrastColorUtil; -import com.android.systemui.plugins.ActivityStarter.OnDismissAction; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.statusbar.notification.NotificationData; +import com.android.systemui.plugins.ActivityStarter.OnDismissAction; import com.android.systemui.statusbar.SmartReplyController; +import com.android.systemui.statusbar.notification.NotificationData; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java index f5ae88b1788d..fed803217568 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java @@ -37,7 +37,6 @@ import android.util.Log; import com.android.internal.util.UserIcons; import com.android.settingslib.drawable.UserIconDrawable; import com.android.systemui.R; -import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java index b5d92a5840e0..cd379c5f551f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java @@ -25,7 +25,6 @@ import android.os.ServiceManager; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.SystemUI; -import com.android.systemui.pip.tv.PipManager; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue.Callbacks; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java index 499be42b0b8c..905b9a398b68 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java @@ -14,19 +14,21 @@ package com.android.systemui.tuner; +import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import android.content.Context; import android.provider.Settings; -import androidx.preference.DropDownPreference; import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; + +import androidx.preference.DropDownPreference; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarIconController; -import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; - public class BatteryPreference extends DropDownPreference implements TunerService.Tunable { private static final String PERCENT = "percent"; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java index 702abeabc136..265823ab0b21 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java @@ -15,9 +15,10 @@ package com.android.systemui.tuner; import android.content.Context; -import androidx.preference.ListPreference; import android.util.AttributeSet; +import androidx.preference.ListPreference; + public class BetterListPreference extends ListPreference { private CharSequence mSummary; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java index 16ab65c341ca..a526603372bd 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java @@ -14,11 +14,12 @@ package com.android.systemui.tuner; import android.content.Context; -import androidx.preference.DropDownPreference; import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; +import androidx.preference.DropDownPreference; + import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.Clock; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java index 8da0043bf439..ade1f8258335 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java @@ -14,7 +14,6 @@ package com.android.systemui.tuner; -import android.annotation.Nullable; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; @@ -22,12 +21,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.ListPreference; import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; + +import androidx.preference.ListPreference; +import androidx.preference.ListPreferenceDialogFragment; public class CustomListPreference extends ListPreference { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java index a0f278bfbb8a..a60ca6201419 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java @@ -23,12 +23,13 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; +import android.view.MenuItem; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.view.MenuItem; +import androidx.preference.SwitchPreference; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java index d63235ca8d26..4dbceac9b3a7 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java @@ -21,32 +21,25 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.LauncherActivityInfo; -import android.content.pm.LauncherApps; -import android.content.pm.LauncherApps.ShortcutQuery; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.ShortcutInfo; import android.graphics.drawable.Drawable; -import android.graphics.drawable.ScaleDrawable; import android.os.Bundle; import android.os.Handler; -import android.os.Process; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; -import android.util.Log; import android.util.TypedValue; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.IntentButtonProvider.IntentButton; @@ -57,7 +50,6 @@ import com.android.systemui.tuner.ShortcutParser.Shortcut; import com.android.systemui.tuner.TunerService.Tunable; import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.function.Consumer; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java index e3a452a0786a..fa531b5243b4 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java @@ -34,9 +34,6 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.Handler; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.text.SpannableStringBuilder; import android.text.style.ImageSpan; import android.util.Log; @@ -44,6 +41,10 @@ import android.util.TypedValue; import android.view.KeyEvent; import android.widget.EditText; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.tuner.TunerService.Tunable; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java b/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java index d766145f27db..7239c8a22a31 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java @@ -15,7 +15,9 @@ package com.android.systemui.tuner; import android.os.Bundle; + import androidx.preference.PreferenceFragment; + import com.android.systemui.R; public class OtherPrefs extends PreferenceFragment { @@ -23,4 +25,4 @@ public class OtherPrefs extends PreferenceFragment { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.other_settings); } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java index ecb830c48ccc..dae1472c42af 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java @@ -29,6 +29,11 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.view.View; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.util.ArrayUtils; import com.android.systemui.Dependency; import com.android.systemui.R; @@ -41,11 +46,6 @@ import com.android.systemui.shared.plugins.PluginPrefs; import java.util.List; import java.util.Set; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - public class PluginFragment extends PreferenceFragment { public static final String ACTION_PLUGIN_SETTINGS diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java index 8740a3c2f45a..80f9de6b4ba5 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java @@ -15,10 +15,6 @@ */ package com.android.systemui.tuner; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.R; - import android.annotation.Nullable; import android.app.Fragment; import android.os.Bundle; @@ -29,6 +25,10 @@ import android.view.ViewGroup; import android.widget.Switch; import android.widget.TextView; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.R; + public class PowerNotificationControlsFragment extends Fragment { private static final String KEY_SHOW_PNC = "show_importance_slider"; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java index d80c649be1ba..79811c5de42d 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java @@ -17,21 +17,19 @@ package com.android.systemui.tuner; import android.app.AlertDialog.Builder; import android.app.Dialog; import android.app.DialogFragment; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.Toolbar; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.Utils; -import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.R; +import com.android.systemui.fragments.FragmentHostManager; import java.util.Objects; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java b/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java index dded464901ac..0be793eefa18 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java @@ -16,9 +16,10 @@ package com.android.systemui.tuner; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.preference.CheckBoxPreference; import android.util.TypedValue; +import androidx.preference.CheckBoxPreference; + import com.android.systemui.statusbar.ScalingDrawableWrapper; public class SelectablePreference extends CheckBoxPreference { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java b/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java index 3c9d25d13350..11e1f278a271 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java @@ -20,12 +20,12 @@ import android.content.Context; import android.content.pm.LauncherActivityInfo; import android.content.pm.LauncherApps; import android.content.pm.PackageManager.NameNotFoundException; -import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Process; -import androidx.preference.PreferenceFragment; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java index 670fcc2a4d15..6f23e207c048 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java @@ -19,10 +19,11 @@ import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java index 5aa303530ae5..ecf1784e66c4 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java @@ -22,12 +22,13 @@ import android.content.DialogInterface; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java index a22277eea05b..9cc8943aa6de 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java @@ -15,9 +15,9 @@ package com.android.systemui.tuner; import android.app.DialogFragment; -import android.os.Bundle; -import androidx.preference.PreferenceFragment; + import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; public abstract class TunerPreferenceFragment extends PreferenceFragment { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java index 3a9d1c7caeb8..3bccdab8c1ba 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java @@ -26,8 +26,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.UserHandle; import android.provider.Settings; -import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; -import com.android.systemui.DemoMode; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.phone.SystemUIDialog; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java index f53d51690712..2df9000ed665 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java @@ -3,9 +3,10 @@ package com.android.systemui.tuner; import android.content.Context; import android.content.res.TypedArray; import android.provider.Settings; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.MetricsLogger; import com.android.systemui.Dependency; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index 2f8dfdc2991a..329d02959435 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -19,7 +19,6 @@ package com.android.systemui.usb; import android.annotation.NonNull; import android.app.Notification; import android.app.Notification.Action; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java index ec5030b8b028..fa3ff64e5e18 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java @@ -16,6 +16,8 @@ package com.android.systemui.usb; +import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE; + import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.pm.ResolveInfo; @@ -38,8 +40,6 @@ import com.android.systemui.R; import java.util.ArrayList; import java.util.Iterator; -import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE; - /* Activity for choosing an application for a USB device or accessory */ public class UsbResolverActivity extends ResolverActivity { public static final String TAG = "UsbResolverActivity"; diff --git a/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java b/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java index c468fef293de..f35af90edc3c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java +++ b/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java @@ -16,7 +16,6 @@ package com.android.systemui.util; import android.app.NotificationChannel; import android.app.NotificationManager; - import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioAttributes; diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java index 9b15b00b9242..efd6e03b0d20 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java @@ -20,9 +20,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import androidx.core.content.FileProvider; import android.util.Log; +import androidx.core.content.FileProvider; + import com.android.systemui.Dependency; import java.io.BufferedInputStream; diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java index 3c88d29f1711..b2cc2694916e 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java @@ -37,7 +37,6 @@ import android.os.Message; import android.os.Process; import android.os.SystemProperties; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.service.quicksettings.Tile; import android.text.format.DateUtils; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/LeakDetector.java b/packages/SystemUI/src/com/android/systemui/util/leak/LeakDetector.java index 574fdb98caa7..c50e8f8a3596 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/LeakDetector.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/LeakDetector.java @@ -24,7 +24,6 @@ import com.android.systemui.Dumpable; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.io.Writer; import java.util.Collection; /** diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java b/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java index 8ea5fd4ee93c..a47e99d1e84d 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java @@ -27,9 +27,10 @@ import android.net.Uri; import android.os.Debug; import android.os.SystemProperties; import android.os.UserHandle; -import androidx.core.content.FileProvider; import android.util.Log; +import androidx.core.content.FileProvider; + import com.google.android.collect.Lists; import java.io.File; diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java index f2ed55f3dd32..13729dfbccda 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java @@ -16,9 +16,6 @@ package com.android.systemui.util.wakelock; -import android.os.Handler; -import android.os.PowerManager; - import com.android.internal.util.Preconditions; public class SettableWakeLock { diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java index 16ce35c50ea2..b0f1b54b262e 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java @@ -18,6 +18,7 @@ package com.android.systemui.util.wakelock; import android.content.Context; import android.os.PowerManager; + import androidx.annotation.VisibleForTesting; /** WakeLock wrapper for testability */ @@ -71,4 +72,4 @@ public interface WakeLock { } }; } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java index 9077b6b10ac7..9b616e00a72f 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java @@ -34,8 +34,8 @@ import android.content.ServiceConnection; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.graphics.PixelFormat; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.media.AudioAttributes; import android.media.AudioManager; @@ -65,17 +65,17 @@ import androidx.car.widget.ListItemProvider.ListProvider; import androidx.car.widget.PagedListView; import androidx.car.widget.SeekbarListItem; -import java.util.Iterator; +import com.android.systemui.R; +import com.android.systemui.plugins.VolumeDialog; + import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -import com.android.systemui.R; -import com.android.systemui.plugins.VolumeDialog; - /** * Car version of the volume dialog. * diff --git a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java index c97095e1860b..361604c461b4 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java @@ -27,7 +27,6 @@ import android.util.Log; import android.view.KeyEvent; import android.view.WindowManager; - import com.android.systemui.statusbar.phone.SystemUIDialog; abstract public class SafetyWarningDialog extends SystemUIDialog @@ -116,4 +115,4 @@ abstract public class SafetyWarningDialog extends SystemUIDialog } } }; -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java index 36c673c7106b..42393375b45e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java @@ -19,7 +19,6 @@ package com.android.systemui.volume; import android.content.res.Configuration; import com.android.systemui.DemoMode; -import com.android.systemui.statusbar.policy.ZenModeController; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java index 6f65b081afc4..e4f37decdf35 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java @@ -23,8 +23,6 @@ import android.util.Log; import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.qs.tiles.DndTile; -import com.android.systemui.statusbar.policy.ZenModeController; -import com.android.systemui.statusbar.policy.ZenModeControllerImpl; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 882f2615f443..d442de20db1e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -593,6 +593,30 @@ public class StatusBarTest extends SysuiTestCase { verify(mStatusBarStateController).setState(eq(StatusBarState.FULLSCREEN_USER_SWITCHER)); } + @Test + public void testStartStopDozing() { + mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); + when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); + + mStatusBar.mDozeServiceHost.startDozing(); + verify(mStatusBarStateController).setIsDozing(eq(true)); + + mStatusBar.mDozeServiceHost.stopDozing(); + verify(mStatusBarStateController).setIsDozing(eq(false)); + } + + @Test + public void testOnStartedWakingUp_isNotDozing() { + mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); + when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); + + mStatusBar.mDozeServiceHost.startDozing(); + verify(mStatusBarStateController).setIsDozing(eq(true)); + + mStatusBar.mWakefulnessObserver.onStartedWakingUp(); + verify(mStatusBarStateController).setIsDozing(eq(false)); + } + static class TestableStatusBar extends StatusBar { public TestableStatusBar(StatusBarKeyguardViewManager man, UnlockMethodCache unlock, KeyguardIndicationController key, @@ -642,6 +666,7 @@ public class StatusBarTest extends SysuiTestCase { mLockscreenUserManager = notificationLockscreenUserManager; mCommandQueue = commandQueue; mPresenter = notificationPresenter; + mGestureWakeLock = mock(PowerManager.WakeLock.class); } private WakefulnessLifecycle createAwakeWakefulnessLifecycle() { diff --git a/proto/src/wifi.proto b/proto/src/wifi.proto index 033e99605d3f..11963d2a2c89 100644 --- a/proto/src/wifi.proto +++ b/proto/src/wifi.proto @@ -1674,4 +1674,20 @@ message WifiLinkLayerUsageStats { // Total time the wifi radio is scanning in ms over the logging duration. optional int64 radio_scan_time_ms = 5; + + // Total time the wifi radio spent doing nan scans in ms over the logging duration. + optional int64 radio_nan_scan_time_ms = 6; + + // Total time the wifi radio spent doing background scans in ms over the logging duration. + optional int64 radio_background_scan_time_ms = 7; + + // Total time the wifi radio spent doing roam scans in ms over the logging duration. + optional int64 radio_roam_scan_time_ms = 8; + + // Total time the wifi radio spent doing pno scans in ms over the logging duration. + optional int64 radio_pno_scan_time_ms = 9; + + // Total time the wifi radio spent doing hotspot 2.0 scans and GAS exchange + // in ms over the logging duration. + optional int64 radio_hs20_scan_time_ms = 10; }
\ No newline at end of file diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java new file mode 100644 index 000000000000..18011f620b24 --- /dev/null +++ b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.android.internal.util.Preconditions.checkArgument; + +import com.android.server.backup.encryption.chunking.Chunker; + +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.util.Arrays; + +/** Splits a stream of bytes into variable-sized chunks, using content-defined chunking. */ +public class ContentDefinedChunker implements Chunker { + private static final int WINDOW_SIZE = 31; + private static final byte DEFAULT_OUT_BYTE = (byte) 0; + + private final byte[] mChunkBuffer; + private final RabinFingerprint64 mRabinFingerprint64; + private final FingerprintMixer mFingerprintMixer; + private final BreakpointPredicate mBreakpointPredicate; + private final int mMinChunkSize; + private final int mMaxChunkSize; + + /** + * Constructor. + * + * @param minChunkSize The minimum size of a chunk. No chunk will be produced of a size smaller + * than this except possibly at the very end of the stream. + * @param maxChunkSize The maximum size of a chunk. No chunk will be produced of a larger size. + * @param rabinFingerprint64 Calculates fingerprints, with which to determine breakpoints. + * @param breakpointPredicate Given a Rabin fingerprint, returns whether this ought to be a + * breakpoint. + */ + public ContentDefinedChunker( + int minChunkSize, + int maxChunkSize, + RabinFingerprint64 rabinFingerprint64, + FingerprintMixer fingerprintMixer, + BreakpointPredicate breakpointPredicate) { + checkArgument( + minChunkSize >= WINDOW_SIZE, + "Minimum chunk size must be greater than window size."); + checkArgument( + maxChunkSize >= minChunkSize, + "Maximum chunk size cannot be smaller than minimum chunk size."); + mChunkBuffer = new byte[maxChunkSize]; + mRabinFingerprint64 = rabinFingerprint64; + mBreakpointPredicate = breakpointPredicate; + mFingerprintMixer = fingerprintMixer; + mMinChunkSize = minChunkSize; + mMaxChunkSize = maxChunkSize; + } + + /** + * Breaks the input stream into variable-sized chunks. + * + * @param inputStream The input bytes to break into chunks. + * @param chunkConsumer A function to process each chunk as it's generated. + * @throws IOException Thrown if there is an issue reading from the input stream. + * @throws GeneralSecurityException Thrown if the {@link ChunkConsumer} throws it. + */ + @Override + public void chunkify(InputStream inputStream, ChunkConsumer chunkConsumer) + throws IOException, GeneralSecurityException { + int chunkLength; + int initialReadLength = mMinChunkSize - WINDOW_SIZE; + + // Performance optimization - there is no reason to calculate fingerprints for windows + // ending before the minimum chunk size. + while ((chunkLength = + inputStream.read(mChunkBuffer, /*off=*/ 0, /*len=*/ initialReadLength)) + != -1) { + int b; + long fingerprint = 0L; + + while ((b = inputStream.read()) != -1) { + byte inByte = (byte) b; + byte outByte = getCurrentWindowStartByte(chunkLength); + mChunkBuffer[chunkLength++] = inByte; + + fingerprint = + mRabinFingerprint64.computeFingerprint64(inByte, outByte, fingerprint); + + if (chunkLength >= mMaxChunkSize + || (chunkLength >= mMinChunkSize + && mBreakpointPredicate.isBreakpoint( + mFingerprintMixer.mix(fingerprint)))) { + chunkConsumer.accept(Arrays.copyOf(mChunkBuffer, chunkLength)); + chunkLength = 0; + break; + } + } + + if (chunkLength > 0) { + chunkConsumer.accept(Arrays.copyOf(mChunkBuffer, chunkLength)); + } + } + } + + private byte getCurrentWindowStartByte(int chunkLength) { + if (chunkLength < mMinChunkSize) { + return DEFAULT_OUT_BYTE; + } else { + return mChunkBuffer[chunkLength - WINDOW_SIZE]; + } + } + + /** Whether the current fingerprint indicates the end of a chunk. */ + public interface BreakpointPredicate { + + /** + * Returns {@code true} if the fingerprint of the last {@code WINDOW_SIZE} bytes indicates + * the chunk ought to end at this position. + * + * @param fingerprint Fingerprint of the last {@code WINDOW_SIZE} bytes. + * @return Whether this ought to be a chunk breakpoint. + */ + boolean isBreakpoint(long fingerprint); + } +} diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java new file mode 100644 index 000000000000..e9f30505c112 --- /dev/null +++ b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.android.internal.util.Preconditions.checkArgument; + +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; + +import javax.crypto.SecretKey; + +/** + * Helper for mixing fingerprint with key material. + * + * <p>We do this as otherwise the Rabin fingerprint leaks information about the plaintext. i.e., if + * two users have the same file, it will be partitioned by Rabin in the same way, allowing us to + * infer that it is the same as another user's file. + * + * <p>By mixing the fingerprint with the user's secret key, the chunking method is different on a + * per key basis. Each application has its own {@link SecretKey}, so we cannot infer that a file is + * the same even across multiple applications owned by the same user, never mind across multiple + * users. + * + * <p>Instead of directly mixing the fingerprint with the user's secret, we first securely and + * deterministically derive a secondary chunking key. As Rabin is not a cryptographically secure + * hash, it might otherwise leak information about the user's secret. This prevents that from + * happening. + */ +public class FingerprintMixer { + public static final int SALT_LENGTH_BYTES = 256 / Byte.SIZE; + private static final String DERIVED_KEY_NAME = "RabinFingerprint64Mixer"; + + private final long mAddend; + private final long mMultiplicand; + + /** + * A new instance from a given secret key and salt. Salt must be the same across incremental + * backups, or a different chunking strategy will be used each time, defeating the dedup. + * + * @param secretKey The application-specific secret. + * @param salt The salt. + * @throws InvalidKeyException If the encoded form of {@code secretKey} is inaccessible. + */ + public FingerprintMixer(SecretKey secretKey, byte[] salt) throws InvalidKeyException { + checkArgument(salt.length == SALT_LENGTH_BYTES, "Requires a 256-bit salt."); + byte[] keyBytes = secretKey.getEncoded(); + if (keyBytes == null) { + throw new InvalidKeyException("SecretKey must support encoding for FingerprintMixer."); + } + byte[] derivedKey = + Hkdf.hkdf(keyBytes, salt, DERIVED_KEY_NAME.getBytes(StandardCharsets.UTF_8)); + ByteBuffer buffer = ByteBuffer.wrap(derivedKey); + mAddend = buffer.getLong(); + // Multiplicand must be odd - otherwise we lose some bits of the Rabin fingerprint when + // mixing + mMultiplicand = buffer.getLong() | 1; + } + + /** + * Mixes the fingerprint with the derived key material. This is performed by adding part of the + * derived key and multiplying by another part of the derived key (which is forced to be odd, so + * that the operation is reversible). + * + * @param fingerprint A 64-bit Rabin fingerprint. + * @return The mixed fingerprint. + */ + long mix(long fingerprint) { + return ((fingerprint + mAddend) * mMultiplicand); + } + + /** The addend part of the derived key. */ + long getAddend() { + return mAddend; + } + + /** The multiplicand part of the derived key. */ + long getMultiplicand() { + return mMultiplicand; + } +} diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java new file mode 100644 index 000000000000..6f4f549ab2d7 --- /dev/null +++ b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.android.internal.util.Preconditions.checkNotNull; + +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +/** + * Secure HKDF utils. Allows client to deterministically derive additional key material from a base + * secret. If the derived key material is compromised, this does not in of itself compromise the + * root secret. + * + * <p>TODO(b/116575321): After all code is ported, rename this class to HkdfUtils. + */ +public final class Hkdf { + private static final byte[] CONSTANT_01 = {0x01}; + private static final String HmacSHA256 = "HmacSHA256"; + private static final String AES = "AES"; + + /** + * Implements HKDF (RFC 5869) with the SHA-256 hash and a 256-bit output key length. + * + * <p>IMPORTANT: The use or edit of this method requires a security review. + * + * @param masterKey Master key from which to derive sub-keys. + * @param salt A randomly generated 256-bit byte string. + * @param data Arbitrary information that is bound to the derived key (i.e., used in its + * creation). + * @return Raw derived key bytes = HKDF-SHA256(masterKey, salt, data). + * @throws InvalidKeyException If the salt can not be used as a valid key. + */ + static byte[] hkdf(byte[] masterKey, byte[] salt, byte[] data) throws InvalidKeyException { + checkNotNull(masterKey, "HKDF requires master key to be set."); + checkNotNull(salt, "HKDF requires a salt."); + checkNotNull(data, "No data provided to HKDF."); + return hkdfSha256Expand(hkdfSha256Extract(masterKey, salt), data); + } + + private Hkdf() {} + + /** + * The HKDF (RFC 5869) extraction function, using the SHA-256 hash function. This function is + * used to pre-process the {@code inputKeyMaterial} and mix it with the {@code salt}, producing + * output suitable for use with HKDF expansion function (which produces the actual derived key). + * + * <p>IMPORTANT: The use or edit of this method requires a security review. + * + * @see #hkdfSha256Expand(byte[], byte[]) + * @return HMAC-SHA256(salt, inputKeyMaterial) (salt is the "key" for the HMAC) + * @throws InvalidKeyException If the salt can not be used as a valid key. + */ + private static byte[] hkdfSha256Extract(byte[] inputKeyMaterial, byte[] salt) + throws InvalidKeyException { + // Note that the SecretKey encoding format is defined to be RAW, so the encoded form should + // be consistent across implementations. + Mac sha256; + try { + sha256 = Mac.getInstance(HmacSHA256); + } catch (NoSuchAlgorithmException e) { + // This can not happen - HmacSHA256 is supported by the platform. + throw new AssertionError(e); + } + sha256.init(new SecretKeySpec(salt, AES)); + + return sha256.doFinal(inputKeyMaterial); + } + + /** + * Special case of HKDF (RFC 5869) expansion function, using the SHA-256 hash function and + * allowing for a maximum output length of 256 bits. + * + * <p>IMPORTANT: The use or edit of this method requires a security review. + * + * @param pseudoRandomKey Generated by {@link #hkdfSha256Extract(byte[], byte[])}. + * @param info Arbitrary information the derived key should be bound to. + * @return Raw derived key bytes = HMAC-SHA256(pseudoRandomKey, info | 0x01). + * @throws InvalidKeyException If the salt can not be used as a valid key. + */ + private static byte[] hkdfSha256Expand(byte[] pseudoRandomKey, byte[] info) + throws InvalidKeyException { + // Note that RFC 5869 computes number of blocks N = ceil(hash length / output length), but + // here we only deal with a 256 bit hash up to a 256 bit output, yielding N=1. + Mac sha256; + try { + sha256 = Mac.getInstance(HmacSHA256); + } catch (NoSuchAlgorithmException e) { + // This can not happen - HmacSHA256 is supported by the platform. + throw new AssertionError(e); + } + sha256.init(new SecretKeySpec(pseudoRandomKey, AES)); + + sha256.update(info); + sha256.update(CONSTANT_01); + return sha256.doFinal(); + } +} diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java new file mode 100644 index 000000000000..e867e7c1b801 --- /dev/null +++ b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.android.internal.util.Preconditions.checkArgument; + +import com.android.server.backup.encryption.chunking.cdc.ContentDefinedChunker.BreakpointPredicate; + +/** + * Function to determine whether a 64-bit fingerprint ought to be a chunk breakpoint. + * + * <p>This works by checking whether there are at least n leading zeros in the fingerprint. n is + * calculated to on average cause a breakpoint after a given number of trials (provided in the + * constructor). This allows us to choose a number of trials that gives a desired average chunk + * size. This works because the fingerprint is pseudo-randomly distributed. + */ +public class IsChunkBreakpoint implements BreakpointPredicate { + private final int mLeadingZeros; + private final long mBitmask; + + /** + * A new instance that causes a breakpoint after a given number of trials on average. + * + * @param averageNumberOfTrialsUntilBreakpoint The number of trials after which on average to + * create a new chunk. If this is not a power of 2, some precision is sacrificed (i.e., on + * average, breaks will actually happen after the nearest power of 2 to the average number + * of trials passed in). + */ + public IsChunkBreakpoint(long averageNumberOfTrialsUntilBreakpoint) { + checkArgument( + averageNumberOfTrialsUntilBreakpoint >= 0, + "Average number of trials must be non-negative"); + + // Want n leading zeros after t trials. + // P(leading zeros = n) = 1/2^n + // Expected num trials to get n leading zeros = 1/2^-n + // t = 1/2^-n + // n = log2(t) + mLeadingZeros = (int) Math.round(log2(averageNumberOfTrialsUntilBreakpoint)); + mBitmask = ~(~0L >>> mLeadingZeros); + } + + /** + * Returns {@code true} if {@code fingerprint} indicates that there should be a chunk + * breakpoint. + */ + @Override + public boolean isBreakpoint(long fingerprint) { + return (fingerprint & mBitmask) == 0; + } + + /** Returns the number of leading zeros in the fingerprint that causes a breakpoint. */ + public int getLeadingZeros() { + return mLeadingZeros; + } + + /** + * Calculates log base 2 of x. Not the most efficient possible implementation, but it's simple, + * obviously correct, and is only invoked on object construction. + */ + private static double log2(double x) { + return Math.log(x) / Math.log(2); + } +} diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java new file mode 100644 index 000000000000..1e14ffa5ad77 --- /dev/null +++ b/services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +/** Helper to calculate a 64-bit Rabin fingerprint over a 31-byte window. */ +public class RabinFingerprint64 { + private static final long DEFAULT_IRREDUCIBLE_POLYNOMIAL_64 = 0x000000000000001BL; + private static final int POLYNOMIAL_DEGREE = 64; + private static final int SLIDING_WINDOW_SIZE_BYTES = 31; + + private final long mPoly64; + // Auxiliary tables to speed up the computation of Rabin fingerprints. + private final long[] mTableFP64 = new long[256]; + private final long[] mTableOutByte = new long[256]; + + /** + * Constructs a new instance over the given irreducible 64-degree polynomial. It is up to the + * caller to determine that the polynomial is irreducible. If it is not the fingerprinting will + * not behave as expected. + * + * @param poly64 The polynomial. + */ + public RabinFingerprint64(long poly64) { + mPoly64 = poly64; + } + + /** Constructs a new instance using {@code x^64 + x^4 + x + 1} as the irreducible polynomial. */ + public RabinFingerprint64() { + this(DEFAULT_IRREDUCIBLE_POLYNOMIAL_64); + computeFingerprintTables64(); + computeFingerprintTables64Windowed(); + } + + /** + * Computes the fingerprint for the new sliding window given the fingerprint of the previous + * sliding window, the byte sliding in, and the byte sliding out. + * + * @param inChar The new char coming into the sliding window. + * @param outChar The left most char sliding out of the window. + * @param fingerPrint Fingerprint for previous window. + * @return New fingerprint for the new sliding window. + */ + public long computeFingerprint64(byte inChar, byte outChar, long fingerPrint) { + return (fingerPrint << 8) + ^ (inChar & 0xFF) + ^ mTableFP64[(int) (fingerPrint >>> 56)] + ^ mTableOutByte[outChar & 0xFF]; + } + + /** Compute auxiliary tables to speed up the fingerprint computation. */ + private void computeFingerprintTables64() { + long[] degreesRes64 = new long[POLYNOMIAL_DEGREE]; + degreesRes64[0] = mPoly64; + for (int i = 1; i < POLYNOMIAL_DEGREE; i++) { + if ((degreesRes64[i - 1] & (1L << 63)) == 0) { + degreesRes64[i] = degreesRes64[i - 1] << 1; + } else { + degreesRes64[i] = (degreesRes64[i - 1] << 1) ^ mPoly64; + } + } + for (int i = 0; i < 256; i++) { + int currIndex = i; + for (int j = 0; (currIndex > 0) && (j < 8); j++) { + if ((currIndex & 0x1) == 1) { + mTableFP64[i] ^= degreesRes64[j]; + } + currIndex >>>= 1; + } + } + } + + /** + * Compute auxiliary table {@code mTableOutByte} to facilitate the computing of fingerprints for + * sliding windows. This table is to take care of the effect on the fingerprint when the + * leftmost byte in the window slides out. + */ + private void computeFingerprintTables64Windowed() { + // Auxiliary array degsRes64[8] defined by: <code>degsRes64[i] = x^(8 * + // SLIDING_WINDOW_SIZE_BYTES + i) mod this.mPoly64.</code> + long[] degsRes64 = new long[8]; + degsRes64[0] = mPoly64; + for (int i = 65; i < 8 * (SLIDING_WINDOW_SIZE_BYTES + 1); i++) { + if ((degsRes64[(i - 1) % 8] & (1L << 63)) == 0) { + degsRes64[i % 8] = degsRes64[(i - 1) % 8] << 1; + } else { + degsRes64[i % 8] = (degsRes64[(i - 1) % 8] << 1) ^ mPoly64; + } + } + for (int i = 0; i < 256; i++) { + int currIndex = i; + for (int j = 0; (currIndex > 0) && (j < 8); j++) { + if ((currIndex & 0x1) == 1) { + mTableOutByte[i] ^= degsRes64[j]; + } + currIndex >>>= 1; + } + } + } +} diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 78e82b6f7821..923ac0063baf 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -186,8 +186,6 @@ class StorageManagerService extends IStorageManager.Stub private static final boolean ENABLE_ISOLATED_STORAGE = SystemProperties .getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false); - private static final String SHARED_SANDBOX_ID_PREFIX = "shared:"; - public static class Lifecycle extends SystemService { private StorageManagerService mStorageManagerService; @@ -1501,7 +1499,8 @@ class StorageManagerService extends IStorageManager.Stub } private static String getSandboxId(String packageName, String sharedUserId) { - return sharedUserId == null ? packageName : SHARED_SANDBOX_ID_PREFIX + sharedUserId; + return sharedUserId == null + ? packageName : StorageManager.SHARED_SANDBOX_PREFIX + sharedUserId; } private void connect() { diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index a33ac700ba95..b5217ad7af19 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -192,10 +192,10 @@ public final class ActiveServices { public void stopForegroundServicesForUidPackage(final int uid, final String packageName) { synchronized (mAm) { final ServiceMap smap = getServiceMapLocked(UserHandle.getUserId(uid)); - final int N = smap.mServicesByName.size(); + final int N = smap.mServicesByInstanceName.size(); final ArrayList<ServiceRecord> toStop = new ArrayList<>(N); for (int i = 0; i < N; i++) { - final ServiceRecord r = smap.mServicesByName.valueAt(i); + final ServiceRecord r = smap.mServicesByInstanceName.valueAt(i); if (uid == r.serviceInfo.applicationInfo.uid || packageName.equals(r.serviceInfo.packageName)) { if (r.isForeground) { @@ -246,7 +246,7 @@ public final class ActiveServices { */ final class ServiceMap extends Handler { final int mUserId; - final ArrayMap<ComponentName, ServiceRecord> mServicesByName = new ArrayMap<>(); + final ArrayMap<ComponentName, ServiceRecord> mServicesByInstanceName = new ArrayMap<>(); final ArrayMap<Intent.FilterComparison, ServiceRecord> mServicesByIntent = new ArrayMap<>(); final ArrayList<ServiceRecord> mDelayedStartList = new ArrayList<>(); @@ -368,7 +368,7 @@ public final class ActiveServices { // TODO: Deal with global services if (DEBUG_MU) Slog.v(TAG_MU, "getServiceByNameLocked(" + name + "), callingUser = " + callingUser); - return getServiceMapLocked(callingUser).mServicesByName.get(name); + return getServiceMapLocked(callingUser).mServicesByInstanceName.get(name); } boolean hasBackgroundServicesLocked(int callingUser) { @@ -386,7 +386,7 @@ public final class ActiveServices { } ArrayMap<ComponentName, ServiceRecord> getServicesLocked(int callingUser) { - return getServiceMapLocked(callingUser).mServicesByName; + return getServiceMapLocked(callingUser).mServicesByInstanceName; } private boolean appRestrictedAnyInBackground(final int uid, final String packageName) { @@ -416,7 +416,7 @@ public final class ActiveServices { } ServiceLookupResult res = - retrieveServiceLocked(service, resolvedType, callingPackage, + retrieveServiceLocked(service, null, resolvedType, callingPackage, callingPid, callingUid, userId, true, callerFg, false, false); if (res == null) { return null; @@ -444,7 +444,7 @@ public final class ActiveServices { boolean forcedStandby = false; if (bgLaunch && appRestrictedAnyInBackground(r.appInfo.uid, r.packageName)) { if (DEBUG_FOREGROUND_SERVICE) { - Slog.d(TAG, "Forcing bg-only service start only for " + r.shortName + Slog.d(TAG, "Forcing bg-only service start only for " + r.shortInstanceName + " : bgLaunch=" + bgLaunch + " callerFg=" + callerFg); } forcedStandby = true; @@ -464,7 +464,7 @@ public final class ActiveServices { // Not allowed, fall back to normal start service, failing siliently // if background check restricts that. Slog.w(TAG, "startForegroundService not allowed due to app op: service " - + service + " to " + r.name.flattenToShortString() + + service + " to " + r.shortInstanceName + " from pid=" + callingPid + " uid=" + callingUid + " pkg=" + callingPackage); fgRequired = false; @@ -484,7 +484,7 @@ public final class ActiveServices { r.appInfo.targetSdkVersion, callingPid, false, false, forcedStandby); if (allowed != ActivityManager.APP_START_MODE_NORMAL) { Slog.w(TAG, "Background start not allowed: service " - + service + " to " + r.name.flattenToShortString() + + service + " to " + r.shortInstanceName + " from pid=" + callingPid + " uid=" + callingUid + " pkg=" + callingPackage + " startFg?=" + fgRequired); if (allowed == ActivityManager.APP_START_MODE_DELAYED || forceSilentAbort) { @@ -741,7 +741,7 @@ public final class ActiveServices { } // If this service is active, make sure it is stopped. - ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, null, + ServiceLookupResult r = retrieveServiceLocked(service, null, resolvedType, null, Binder.getCallingPid(), Binder.getCallingUid(), userId, false, false, false, false); if (r != null) { if (r.record != null) { @@ -765,8 +765,8 @@ public final class ActiveServices { ServiceMap services = mServiceMap.get(UserHandle.getUserId(uid)); ArrayList<ServiceRecord> stopping = null; if (services != null) { - for (int i=services.mServicesByName.size()-1; i>=0; i--) { - ServiceRecord service = services.mServicesByName.valueAt(i); + for (int i = services.mServicesByInstanceName.size() - 1; i >= 0; i--) { + ServiceRecord service = services.mServicesByInstanceName.valueAt(i); if (service.appInfo.uid == uid && service.startRequested) { if (mAm.getAppStartModeLocked(service.appInfo.uid, service.packageName, service.appInfo.targetSdkVersion, -1, false, false, false) @@ -774,7 +774,7 @@ public final class ActiveServices { if (stopping == null) { stopping = new ArrayList<>(); } - String compName = service.name.flattenToShortString(); + String compName = service.shortInstanceName; EventLogTags.writeAmStopIdleService(service.appInfo.uid, compName); StringBuilder sb = new StringBuilder(64); sb.append("Stopping service due to app idle: "); @@ -801,7 +801,7 @@ public final class ActiveServices { } IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) { - ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, callingPackage, + ServiceLookupResult r = retrieveServiceLocked(service, null, resolvedType, callingPackage, Binder.getCallingPid(), Binder.getCallingUid(), UserHandle.getCallingUserId(), false, false, false, false); @@ -1228,7 +1228,7 @@ public final class ActiveServices { case AppOpsManager.MODE_IGNORED: // Whoops, silently ignore this. Slog.w(TAG, "Service.startForeground() not allowed due to app op: service " - + r.shortName); + + r.shortInstanceName); ignoreForeground = true; break; default: @@ -1239,7 +1239,7 @@ public final class ActiveServices { appRestrictedAnyInBackground(r.appInfo.uid, r.packageName)) { Slog.w(TAG, "Service.startForeground() not allowed due to bg restriction: service " - + r.shortName); + + r.shortInstanceName); // Back off of any foreground expectations around this service, since we've // just turned down its fg request. updateServiceForegroundLocked(r.app, false); @@ -1293,7 +1293,7 @@ public final class ActiveServices { AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, true); StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, - r.appInfo.uid, r.shortName, + r.appInfo.uid, r.shortInstanceName, StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER); mAm.updateForegroundServiceUsageStats(r.name, r.userId, true); } @@ -1343,7 +1343,7 @@ public final class ActiveServices { AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName); StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, - r.appInfo.uid, r.shortName, + r.appInfo.uid, r.shortInstanceName, StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); if (r.app != null) { @@ -1373,8 +1373,8 @@ public final class ActiveServices { // due the other service. ServiceMap sm = getServiceMapLocked(r.userId); if (sm != null) { - for (int i = sm.mServicesByName.size()-1; i >= 0; i--) { - ServiceRecord other = sm.mServicesByName.valueAt(i); + for (int i = sm.mServicesByInstanceName.size() - 1; i >= 0; i--) { + ServiceRecord other = sm.mServicesByInstanceName.valueAt(i); if (other != r && other.foregroundId == r.foregroundId && other.packageName.equals(r.packageName)) { // Found one! Abort the cancel. @@ -1466,7 +1466,8 @@ public final class ActiveServices { int bindServiceLocked(IApplicationThread caller, IBinder token, Intent service, String resolvedType, final IServiceConnection connection, int flags, - String callingPackage, final int userId) throws TransactionTooLargeException { + String instanceName, String callingPackage, final int userId) + throws TransactionTooLargeException { if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "bindService: " + service + " type=" + resolvedType + " conn=" + connection.asBinder() + " flags=0x" + Integer.toHexString(flags)); @@ -1530,8 +1531,9 @@ public final class ActiveServices { final boolean allowInstant = (flags & Context.BIND_ALLOW_INSTANT) != 0; ServiceLookupResult res = - retrieveServiceLocked(service, resolvedType, callingPackage, Binder.getCallingPid(), - Binder.getCallingUid(), userId, true, callerFg, isBindExternal, allowInstant); + retrieveServiceLocked(service, instanceName, resolvedType, callingPackage, + Binder.getCallingPid(), Binder.getCallingUid(), userId, true, + callerFg, isBindExternal, allowInstant); if (res == null) { return 0; } @@ -1637,7 +1639,7 @@ public final class ActiveServices { mAm.startAssociationLocked(callerApp.uid, callerApp.processName, callerApp.getCurProcState(), s.appInfo.uid, s.appInfo.longVersionCode, - s.name, s.processName); + s.instanceName, s.processName); // Once the apps have become associated, if one of them is caller is ephemeral // the target app should now be able to see the calling app mAm.grantEphemeralAccessLocked(callerApp.userId, service, @@ -1709,7 +1711,7 @@ public final class ActiveServices { try { c.conn.connected(s.name, b.intent.binder, false); } catch (Exception e) { - Slog.w(TAG, "Failure sending service " + s.shortName + Slog.w(TAG, "Failure sending service " + s.shortInstanceName + " to connection " + c.conn.asBinder() + " (in " + c.binding.client.processName + ")", e); } @@ -1763,9 +1765,9 @@ public final class ActiveServices { try { c.conn.connected(r.name, service, false); } catch (Exception e) { - Slog.w(TAG, "Failure sending service " + r.name + - " to connection " + c.conn.asBinder() + - " (in " + c.binding.client.processName + ")", e); + Slog.w(TAG, "Failure sending service " + r.shortInstanceName + + " to connection " + c.conn.asBinder() + + " (in " + c.binding.client.processName + ")", e); } } } @@ -1898,7 +1900,8 @@ public final class ActiveServices { } private ServiceLookupResult retrieveServiceLocked(Intent service, - String resolvedType, String callingPackage, int callingPid, int callingUid, int userId, + String instanceName, String resolvedType, String callingPackage, + int callingPid, int callingUid, int userId, boolean createIfNeeded, boolean callingFromFg, boolean isBindExternal, boolean allowInstant) { ServiceRecord r = null; @@ -1909,12 +1912,23 @@ public final class ActiveServices { ActivityManagerInternal.ALLOW_NON_FULL_IN_PROFILE, "service", null); ServiceMap smap = getServiceMapLocked(userId); - final ComponentName comp = service.getComponent(); + final ComponentName comp; + if (instanceName == null) { + comp = service.getComponent(); + } else { + final ComponentName realComp = service.getComponent(); + if (realComp == null) { + throw new IllegalArgumentException("Can't use custom instance name '" + instanceName + + "' without expicit component in Intent"); + } + comp = new ComponentName(realComp.getPackageName(), + realComp.getClassName() + ":" + instanceName); + } if (comp != null) { - r = smap.mServicesByName.get(comp); + r = smap.mServicesByInstanceName.get(comp); if (DEBUG_SERVICE && r != null) Slog.v(TAG_SERVICE, "Retrieved by component: " + r); } - if (r == null && !isBindExternal) { + if (r == null && !isBindExternal && instanceName == null) { Intent.FilterComparison filter = new Intent.FilterComparison(service); r = smap.mServicesByIntent.get(filter); if (DEBUG_SERVICE && r != null) Slog.v(TAG_SERVICE, "Retrieved by intent: " + r); @@ -1936,24 +1950,29 @@ public final class ActiveServices { // TODO: come back and remove this assumption to triage all services ResolveInfo rInfo = mAm.getPackageManagerInternalLocked().resolveService(service, resolvedType, flags, userId, callingUid); - ServiceInfo sInfo = - rInfo != null ? rInfo.serviceInfo : null; + ServiceInfo sInfo = rInfo != null ? rInfo.serviceInfo : null; if (sInfo == null) { Slog.w(TAG_SERVICE, "Unable to start service " + service + " U=" + userId + ": not found"); return null; } - ComponentName name = new ComponentName( + if (instanceName != null + && (sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) == 0) { + throw new IllegalArgumentException("Can't use instance name '" + instanceName + + "' with non-isolated service '" + sInfo.name + "'"); + } + ComponentName className = new ComponentName( sInfo.applicationInfo.packageName, sInfo.name); + ComponentName name = comp != null ? comp : className; if ((sInfo.flags & ServiceInfo.FLAG_EXTERNAL_SERVICE) != 0) { if (isBindExternal) { if (!sInfo.exported) { - throw new SecurityException("BIND_EXTERNAL_SERVICE failed, " + name + - " is not exported"); + throw new SecurityException("BIND_EXTERNAL_SERVICE failed, " + + className + " is not exported"); } if ((sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) == 0) { - throw new SecurityException("BIND_EXTERNAL_SERVICE failed, " + name + - " is not an isolatedProcess"); + throw new SecurityException("BIND_EXTERNAL_SERVICE failed, " + + className + " is not an isolatedProcess"); } // Run the service under the calling package's application. ApplicationInfo aInfo = AppGlobals.getPackageManager().getApplicationInfo( @@ -1967,6 +1986,9 @@ public final class ActiveServices { sInfo.applicationInfo.packageName = aInfo.packageName; sInfo.applicationInfo.uid = aInfo.uid; name = new ComponentName(aInfo.packageName, name.getClassName()); + className = new ComponentName(aInfo.packageName, + instanceName == null ? className.getClassName() + : (className.getClassName() + ":" + instanceName)); service.setComponent(name); } else { throw new SecurityException("BIND_EXTERNAL_SERVICE required for " + @@ -1986,7 +2008,7 @@ public final class ActiveServices { sInfo = new ServiceInfo(sInfo); sInfo.applicationInfo = mAm.getAppInfoForUser(sInfo.applicationInfo, userId); } - r = smap.mServicesByName.get(name); + r = smap.mServicesByInstanceName.get(name); if (DEBUG_SERVICE && r != null) Slog.v(TAG_SERVICE, "Retrieved via pm by intent: " + r); if (r == null && createIfNeeded) { @@ -1997,19 +2019,20 @@ public final class ActiveServices { final BatteryStatsImpl stats = mAm.mBatteryStatsService.getActiveStatistics(); synchronized (stats) { ss = stats.getServiceStatsLocked( - sInfo.applicationInfo.uid, sInfo.packageName, - sInfo.name); + sInfo.applicationInfo.uid, name.getPackageName(), + name.getClassName()); } - r = new ServiceRecord(mAm, ss, name, filter, sInfo, callingFromFg, res); + r = new ServiceRecord(mAm, ss, className, name, filter, sInfo, callingFromFg, + res); res.setService(r); - smap.mServicesByName.put(name, r); + smap.mServicesByInstanceName.put(name, r); smap.mServicesByIntent.put(filter, r); // Make sure this component isn't in the pending list. for (int i=mPendingServices.size()-1; i>=0; i--) { final ServiceRecord pr = mPendingServices.get(i); if (pr.serviceInfo.applicationInfo.uid == sInfo.applicationInfo.uid - && pr.name.equals(name)) { + && pr.instanceName.equals(name)) { if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "Remove pending: " + pr); mPendingServices.remove(i); } @@ -2024,14 +2047,14 @@ public final class ActiveServices { if (mAm.checkComponentPermission(r.permission, callingPid, callingUid, r.appInfo.uid, r.exported) != PERMISSION_GRANTED) { if (!r.exported) { - Slog.w(TAG, "Permission Denial: Accessing service " + r.name + Slog.w(TAG, "Permission Denial: Accessing service " + r.shortInstanceName + " from pid=" + callingPid + ", uid=" + callingUid + " that is not exported from uid " + r.appInfo.uid); return new ServiceLookupResult(null, "not exported from uid " + r.appInfo.uid); } - Slog.w(TAG, "Permission Denial: Accessing service " + r.name + Slog.w(TAG, "Permission Denial: Accessing service " + r.shortInstanceName + " from pid=" + callingPid + ", uid=" + callingUid + " requires " + r.permission); @@ -2040,7 +2063,7 @@ public final class ActiveServices { final int opCode = AppOpsManager.permissionToOpCode(r.permission); if (opCode != AppOpsManager.OP_NONE && mAm.mAppOpsService.noteOperation( opCode, callingUid, callingPackage) != AppOpsManager.MODE_ALLOWED) { - Slog.w(TAG, "Appop Denial: Accessing service " + r.name + Slog.w(TAG, "Appop Denial: Accessing service " + r.shortInstanceName + " from pid=" + callingPid + ", uid=" + callingUid + " requires appop " + AppOpsManager.opToName(opCode)); @@ -2061,7 +2084,7 @@ public final class ActiveServices { if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, ">>> EXECUTING " + why + " of " + r + " in app " + r.app); else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG_SERVICE_EXECUTING, ">>> EXECUTING " - + why + " of " + r.shortName); + + why + " of " + r.shortInstanceName); // For b/34123235: Services within the system server won't start until SystemServer // does Looper.loop(), so we shouldn't try to start/bind to them too early in the boot @@ -2146,14 +2169,14 @@ public final class ActiveServices { boolean canceled = false; if (mAm.mAtmInternal.isShuttingDown()) { - Slog.w(TAG, "Not scheduling restart of crashed service " + r.shortName + Slog.w(TAG, "Not scheduling restart of crashed service " + r.shortInstanceName + " - system is shutting down"); return false; } ServiceMap smap = getServiceMapLocked(r.userId); - if (smap.mServicesByName.get(r.name) != r) { - ServiceRecord cur = smap.mServicesByName.get(r.name); + if (smap.mServicesByInstanceName.get(r.instanceName) != r) { + ServiceRecord cur = smap.mServicesByInstanceName.get(r.instanceName); Slog.wtf(TAG, "Attempting to schedule restart of " + r + " when found in map: " + cur); return false; @@ -2184,7 +2207,7 @@ public final class ActiveServices { if (resetTime < dur) resetTime = dur; } else { Slog.w(TAG, "Canceling start item " + si.intent + " in service " - + r.name); + + r.shortInstanceName); canceled = true; } } @@ -2256,9 +2279,9 @@ public final class ActiveServices { mAm.mHandler.postAtTime(r.restarter, r.nextRestartTime); r.nextRestartTime = SystemClock.uptimeMillis() + r.restartDelay; Slog.w(TAG, "Scheduling restart of crashed service " - + r.shortName + " in " + r.restartDelay + "ms"); + + r.shortInstanceName + " in " + r.restartDelay + "ms"); EventLog.writeEvent(EventLogTags.AM_SCHEDULE_SERVICE_RESTART, - r.userId, r.shortName, r.restartDelay); + r.userId, r.shortInstanceName, r.restartDelay); return canceled; } @@ -2393,7 +2416,7 @@ public final class ActiveServices { } catch (TransactionTooLargeException e) { throw e; } catch (RemoteException e) { - Slog.w(TAG, "Exception when starting service " + r.shortName, e); + Slog.w(TAG, "Exception when starting service " + r.shortInstanceName, e); } // If a dead object exception was thrown -- fall through to @@ -2417,7 +2440,7 @@ public final class ActiveServices { // to be executed when the app comes up. if (app == null && !permissionsReviewRequired) { if ((app=mAm.startProcessLocked(procName, r.appInfo, true, intentFlags, - hostingType, r.name, false, isolated, false)) == null) { + hostingType, r.instanceName, false, isolated, false)) == null) { String msg = "Unable to launch app " + r.appInfo.packageName + "/" + r.appInfo.uid + " for service " @@ -2488,8 +2511,9 @@ public final class ActiveServices { try { if (LOG_SERVICE_START_STOP) { String nameTerm; - int lastPeriod = r.shortName.lastIndexOf('.'); - nameTerm = lastPeriod >= 0 ? r.shortName.substring(lastPeriod) : r.shortName; + int lastPeriod = r.shortInstanceName.lastIndexOf('.'); + nameTerm = lastPeriod >= 0 ? r.shortInstanceName.substring(lastPeriod) + : r.shortInstanceName; EventLogTags.writeAmCreateService( r.userId, System.identityHashCode(r), nameTerm, r.app.uid, r.app.pid); } @@ -2705,9 +2729,9 @@ public final class ActiveServices { try { cr.conn.connected(r.name, null, true); } catch (Exception e) { - Slog.w(TAG, "Failure disconnecting service " + r.name + - " to connection " + c.get(i).conn.asBinder() + - " (in " + c.get(i).binding.client.processName + ")", e); + Slog.w(TAG, "Failure disconnecting service " + r.shortInstanceName + + " to connection " + c.get(i).conn.asBinder() + + " (in " + c.get(i).binding.client.processName + ")", e); } } } @@ -2728,7 +2752,7 @@ public final class ActiveServices { ibr.intent.getIntent()); } catch (Exception e) { Slog.w(TAG, "Exception when unbinding service " - + r.shortName, e); + + r.shortInstanceName, e); serviceProcessGoneLocked(r); } } @@ -2773,14 +2797,14 @@ public final class ActiveServices { } final ServiceMap smap = getServiceMapLocked(r.userId); - ServiceRecord found = smap.mServicesByName.remove(r.name); + ServiceRecord found = smap.mServicesByInstanceName.remove(r.instanceName); // Note when this method is called by bringUpServiceLocked(), the service is not found - // in mServicesByName and found will be null. + // in mServicesByInstanceName and found will be null. if (found != null && found != r) { // This is not actually the service we think is running... this should not happen, // but if it does, fail hard. - smap.mServicesByName.put(r.name, found); + smap.mServicesByInstanceName.put(r.instanceName, found); throw new IllegalStateException("Bringing down " + r + " but actually running " + found); } @@ -2807,8 +2831,8 @@ public final class ActiveServices { mAm.mAppOpsService.finishOperation( AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName); - StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortName, - StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); + StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, + r.shortInstanceName, StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); } @@ -2838,7 +2862,7 @@ public final class ActiveServices { r.app.thread.scheduleStopService(r); } catch (Exception e) { Slog.w(TAG, "Exception when destroying service " - + r.shortName, e); + + r.shortInstanceName, e); serviceProcessGoneLocked(r); } } else { @@ -2915,7 +2939,7 @@ public final class ActiveServices { } mAm.stopAssociationLocked(b.client.uid, b.client.processName, s.appInfo.uid, - s.appInfo.longVersionCode, s.name, s.processName); + s.appInfo.longVersionCode, s.instanceName, s.processName); if (b.connections.size() == 0) { b.intent.apps.remove(b.client); @@ -2942,7 +2966,7 @@ public final class ActiveServices { b.intent.doRebind = false; s.app.thread.scheduleUnbindService(s, b.intent.intent.getIntent()); } catch (Exception e) { - Slog.w(TAG, "Exception when unbinding service " + s.shortName, e); + Slog.w(TAG, "Exception when unbinding service " + s.shortInstanceName, e); serviceProcessGoneLocked(s); } } @@ -3061,17 +3085,17 @@ public final class ActiveServices { + ": nesting=" + r.executeNesting + ", inDestroying=" + inDestroying + ", app=" + r.app); else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG_SERVICE_EXECUTING, - "<<< DONE EXECUTING " + r.shortName); + "<<< DONE EXECUTING " + r.shortInstanceName); r.executeNesting--; if (r.executeNesting <= 0) { if (r.app != null) { if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, - "Nesting at 0 of " + r.shortName); + "Nesting at 0 of " + r.shortInstanceName); r.app.execServicesFg = false; r.app.executingServices.remove(r); if (r.app.executingServices.size() == 0) { if (DEBUG_SERVICE || DEBUG_SERVICE_EXECUTING) Slog.v(TAG_SERVICE_EXECUTING, - "No more executingServices of " + r.shortName); + "No more executingServices of " + r.shortInstanceName); mAm.mHandler.removeMessages(ActivityManagerService.SERVICE_TIMEOUT_MSG, r.app); } else if (r.executeFg) { // Need to re-evaluate whether the app still needs to be in the foreground. @@ -3141,7 +3165,7 @@ public final class ActiveServices { } } catch (RemoteException e) { Slog.w(TAG, "Exception in new application when starting service " - + sr.shortName, e); + + sr.shortInstanceName, e); throw e; } } @@ -3227,7 +3251,8 @@ public final class ActiveServices { if (userId == UserHandle.USER_ALL) { for (int i = mServiceMap.size() - 1; i >= 0; i--) { didSomething |= collectPackageServicesLocked(packageName, filterByClasses, - evenPersistent, doit, killProcess, mServiceMap.valueAt(i).mServicesByName); + evenPersistent, doit, killProcess, + mServiceMap.valueAt(i).mServicesByInstanceName); if (!doit && didSomething) { return true; } @@ -3238,7 +3263,7 @@ public final class ActiveServices { } else { ServiceMap smap = mServiceMap.get(userId); if (smap != null) { - ArrayMap<ComponentName, ServiceRecord> items = smap.mServicesByName; + ArrayMap<ComponentName, ServiceRecord> items = smap.mServicesByInstanceName; didSomething = collectPackageServicesLocked(packageName, filterByClasses, evenPersistent, doit, killProcess, items); } @@ -3288,7 +3313,7 @@ public final class ActiveServices { ServiceRecord sr = services.get(i); if (sr.startRequested) { if ((sr.serviceInfo.flags&ServiceInfo.FLAG_STOP_WITH_TASK) != 0) { - Slog.i(TAG, "Stopping service " + sr.shortName + ": remove task"); + Slog.i(TAG, "Stopping service " + sr.shortInstanceName + ": remove task"); stopServiceLocked(sr); } else { sr.pendingStarts.add(new ServiceRecord.StartItem(sr, true, @@ -3326,7 +3351,7 @@ public final class ActiveServices { } catch (Exception e) { // todo: this should be asynchronous! Slog.w(TAG, "Exception thrown disconnected servce " - + r.shortName + + r.shortInstanceName + " from app " + app.processName, e); } } @@ -3400,7 +3425,7 @@ public final class ActiveServices { if (false && proc != null && !proc.isPersistent() && proc.thread != null && proc.pid != 0 && proc.pid != ActivityManagerService.MY_PID && proc.setProcState >= ActivityManager.PROCESS_STATE_LAST_ACTIVITY) { - proc.kill("bound to service " + sr.name.flattenToShortString() + proc.kill("bound to service " + sr.shortInstanceName + " in dying proc " + (app != null ? app.processName : "??"), true); } } @@ -3421,7 +3446,7 @@ public final class ActiveServices { // Sanity check: if the service listed for the app is not one // we actually are maintaining, just let it drop. - final ServiceRecord curRec = smap.mServicesByName.get(sr.name); + final ServiceRecord curRec = smap.mServicesByInstanceName.get(sr.instanceName); if (curRec != sr) { if (curRec != null) { Slog.wtf(TAG, "Service " + sr + " in process " + app @@ -3438,7 +3463,7 @@ public final class ActiveServices { Slog.w(TAG, "Service crashed " + sr.crashCount + " times, stopping: " + sr); EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH, - sr.userId, sr.crashCount, sr.shortName, app.pid); + sr.userId, sr.crashCount, sr.shortInstanceName, app.pid); bringDownServiceLocked(sr); } else if (!allowRestart || !mAm.mUserController.isUserRunning(sr.userId, 0)) { @@ -3644,7 +3669,7 @@ public final class ActiveServices { mLastAnrDump = sw.toString(); mAm.mHandler.removeCallbacks(mLastAnrDumpClearer); mAm.mHandler.postDelayed(mLastAnrDumpClearer, LAST_ANR_LIFETIME_DURATION_MSECS); - anrMessage = "executing service " + timeout.shortName; + anrMessage = "executing service " + timeout.shortInstanceName; } else { Message msg = mAm.mHandler.obtainMessage( ActivityManagerService.SERVICE_TIMEOUT_MSG); @@ -3690,7 +3715,8 @@ public final class ActiveServices { final int userId = UserHandle.getUserId(applicationInfo.uid); ServiceMap serviceMap = mServiceMap.get(userId); if (serviceMap != null) { - ArrayMap<ComponentName, ServiceRecord> servicesByName = serviceMap.mServicesByName; + ArrayMap<ComponentName, ServiceRecord> servicesByName + = serviceMap.mServicesByInstanceName; for (int j = servicesByName.size() - 1; j >= 0; j--) { ServiceRecord serviceRecord = servicesByName.valueAt(j); if (applicationInfo.packageName.equals(serviceRecord.appInfo.packageName)) { @@ -3761,9 +3787,9 @@ public final class ActiveServices { final int[] users = mAm.mUserController.getUsers(); for (int user : users) { ServiceMap smap = getServiceMapLocked(user); - if (smap.mServicesByName.size() > 0) { - for (int si=0; si<smap.mServicesByName.size(); si++) { - ServiceRecord r = smap.mServicesByName.valueAt(si); + if (smap.mServicesByInstanceName.size() > 0) { + for (int si=0; si<smap.mServicesByInstanceName.size(); si++) { + ServiceRecord r = smap.mServicesByInstanceName.valueAt(si); if (!matcher.match(r, r.name)) { continue; } @@ -4164,7 +4190,7 @@ public final class ActiveServices { } long token = proto.start(ActiveServicesProto.SERVICES_BY_USERS); proto.write(ActiveServicesProto.ServicesByUser.USER_ID, user); - ArrayMap<ComponentName, ServiceRecord> alls = smap.mServicesByName; + ArrayMap<ComponentName, ServiceRecord> alls = smap.mServicesByInstanceName; for (int i=0; i<alls.size(); i++) { alls.valueAt(i).writeToProto(proto, ActiveServicesProto.ServicesByUser.SERVICE_RECORDS); @@ -4197,7 +4223,7 @@ public final class ActiveServices { if (smap == null) { continue; } - ArrayMap<ComponentName, ServiceRecord> alls = smap.mServicesByName; + ArrayMap<ComponentName, ServiceRecord> alls = smap.mServicesByInstanceName; for (int i=0; i<alls.size(); i++) { ServiceRecord r1 = alls.valueAt(i); @@ -4235,7 +4261,7 @@ public final class ActiveServices { String innerPrefix = prefix + " "; synchronized (mAm) { pw.print(prefix); pw.print("SERVICE "); - pw.print(r.shortName); pw.print(" "); + pw.print(r.shortInstanceName); pw.print(" "); pw.print(Integer.toHexString(System.identityHashCode(r))); pw.print(" pid="); if (r.app != null) pw.println(r.app.pid); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d1392d0608c0..771d3765d902 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13183,8 +13183,15 @@ public class ActivityManagerService extends IActivityManager.Stub } public int bindService(IApplicationThread caller, IBinder token, Intent service, - String resolvedType, IServiceConnection connection, int flags, String callingPackage, - int userId) throws TransactionTooLargeException { + String resolvedType, IServiceConnection connection, int flags, + String callingPackage, int userId) throws TransactionTooLargeException { + return bindIsolatedService(caller, token, service, resolvedType, connection, flags, + null, callingPackage, userId); + } + + public int bindIsolatedService(IApplicationThread caller, IBinder token, Intent service, + String resolvedType, IServiceConnection connection, int flags, String instanceName, + String callingPackage, int userId) throws TransactionTooLargeException { enforceNotIsolatedCaller("bindService"); // Refuse possible leaked file descriptors @@ -13198,7 +13205,7 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized(this) { return mServices.bindServiceLocked(caller, token, service, - resolvedType, connection, flags, callingPackage, userId); + resolvedType, connection, flags, instanceName, callingPackage, userId); } } @@ -15831,7 +15838,7 @@ public class ActivityManagerService extends IActivityManager.Stub mayBeTop = true; mayBeTopType = "service"; mayBeTopSource = cr.binding.client; - mayBeTopTarget = s.name; + mayBeTopTarget = s.instanceName; clientProcState = ActivityManager.PROCESS_STATE_CACHED_EMPTY; } else { // Special handling for above-top states (persistent @@ -15885,7 +15892,7 @@ public class ActivityManagerService extends IActivityManager.Stub .REASON_SERVICE_IN_USE; app.adjSource = cr.binding.client; app.adjSourceProcState = clientProcState; - app.adjTarget = s.name; + app.adjTarget = s.instanceName; if (DEBUG_OOM_ADJ_REASON || logUid == appUid) { reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to " + adjType + ": " + app + ", due to " + cr.binding.client @@ -15915,7 +15922,7 @@ public class ActivityManagerService extends IActivityManager.Stub .REASON_SERVICE_IN_USE; app.adjSource = a; app.adjSourceProcState = procState; - app.adjTarget = s.name; + app.adjTarget = s.instanceName; if (DEBUG_OOM_ADJ_REASON || logUid == appUid) { reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to service w/activity: " + app); diff --git a/services/core/java/com/android/server/am/AppBindRecord.java b/services/core/java/com/android/server/am/AppBindRecord.java index 4eaebd04a8ad..9870420cae13 100644 --- a/services/core/java/com/android/server/am/AppBindRecord.java +++ b/services/core/java/com/android/server/am/AppBindRecord.java @@ -59,12 +59,12 @@ final class AppBindRecord { public String toString() { return "AppBindRecord{" + Integer.toHexString(System.identityHashCode(this)) - + " " + service.shortName + ":" + client.processName + "}"; + + " " + service.shortInstanceName + ":" + client.processName + "}"; } void writeToProto(ProtoOutputStream proto, long fieldId) { long token = proto.start(fieldId); - proto.write(AppBindRecordProto.SERVICE_NAME, service.shortName); + proto.write(AppBindRecordProto.SERVICE_NAME, service.shortInstanceName); proto.write(AppBindRecordProto.CLIENT_PROC_NAME, client.processName); final int N = connections.size(); for (int i=0; i<N; i++) { diff --git a/services/core/java/com/android/server/am/ConnectionRecord.java b/services/core/java/com/android/server/am/ConnectionRecord.java index 37d07bbda760..bfa3f66ce726 100644 --- a/services/core/java/com/android/server/am/ConnectionRecord.java +++ b/services/core/java/com/android/server/am/ConnectionRecord.java @@ -115,16 +115,16 @@ final class ConnectionRecord { && (binding.service.appInfo.uid != clientUid || !binding.service.processName.equals(clientProcessName))) { ProcessStats.ProcessStateHolder holder = binding.service.app.pkgList.get( - binding.service.name.getPackageName()); + binding.service.instanceName.getPackageName()); if (holder == null) { Slog.wtf(TAG_AM, "No package in referenced service " - + binding.service.name.toShortString() + ": proc=" + binding.service.app); + + binding.service.shortInstanceName + ": proc=" + binding.service.app); } else if (holder.pkg == null) { Slog.wtf(TAG_AM, "Inactive holder in referenced service " - + binding.service.name.toShortString() + ": proc=" + binding.service.app); + + binding.service.shortInstanceName + ": proc=" + binding.service.app); } else { association = holder.pkg.getAssociationStateLocked(holder.state, - binding.service.name.getClassName()).startSource(clientUid, + binding.service.instanceName.getClassName()).startSource(clientUid, clientProcessName); } @@ -202,7 +202,7 @@ final class ConnectionRecord { if (serviceDead) { sb.append("DEAD "); } - sb.append(binding.service.shortName); + sb.append(binding.service.shortInstanceName); sb.append(":@"); sb.append(Integer.toHexString(System.identityHashCode(conn.asBinder()))); sb.append('}'); @@ -223,7 +223,7 @@ final class ConnectionRecord { proto.write(ConnectionRecordProto.FLAGS, ConnectionRecordProto.DEAD); } if (binding.service != null) { - proto.write(ConnectionRecordProto.SERVICE_NAME, binding.service.shortName); + proto.write(ConnectionRecordProto.SERVICE_NAME, binding.service.shortInstanceName); } proto.end(token); } diff --git a/services/core/java/com/android/server/am/IntentBindRecord.java b/services/core/java/com/android/server/am/IntentBindRecord.java index 839b6e1bd634..90aef3efea46 100644 --- a/services/core/java/com/android/server/am/IntentBindRecord.java +++ b/services/core/java/com/android/server/am/IntentBindRecord.java @@ -99,7 +99,7 @@ final class IntentBindRecord { if ((collectFlags()&Context.BIND_AUTO_CREATE) != 0) { sb.append("CR "); } - sb.append(service.shortName); + sb.append(service.shortInstanceName); sb.append(':'); if (intent != null) { intent.getIntent().toShortString(sb, false, false, false, false); diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index d8f94c933ac8..09f8c3eee3b6 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -70,7 +70,8 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN final ActivityManagerService ams; final BatteryStatsImpl.Uid.Pkg.Serv stats; final ComponentName name; // service component. - final String shortName; // name.flattenToShortString(). + final ComponentName instanceName; // service component's per-instance name. + final String shortInstanceName; // instanceName.flattenToShortString(). final Intent.FilterComparison intent; // original intent used to find service. final ServiceInfo serviceInfo; @@ -190,7 +191,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN StringBuilder sb = new StringBuilder(128); sb.append("ServiceRecord{") .append(Integer.toHexString(System.identityHashCode(sr))) - .append(' ').append(sr.shortName) + .append(' ').append(sr.shortInstanceName) .append(" StartItem ") .append(Integer.toHexString(System.identityHashCode(this))) .append(" id=").append(id).append('}'); @@ -235,7 +236,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN void writeToProto(ProtoOutputStream proto, long fieldId) { long token = proto.start(fieldId); - proto.write(ServiceRecordProto.SHORT_NAME, this.shortName); + proto.write(ServiceRecordProto.SHORT_NAME, this.shortInstanceName); proto.write(ServiceRecordProto.IS_RUNNING, app != null); if (app != null) { proto.write(ServiceRecordProto.PID, app.pid); @@ -448,12 +449,14 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN ServiceRecord(ActivityManagerService ams, BatteryStatsImpl.Uid.Pkg.Serv servStats, ComponentName name, + ComponentName instanceName, Intent.FilterComparison intent, ServiceInfo sInfo, boolean callerIsFg, Runnable restarter) { this.ams = ams; this.stats = servStats; this.name = name; - shortName = name.flattenToShortString(); + this.instanceName = instanceName; + shortInstanceName = instanceName.flattenToShortString(); this.intent = intent; serviceInfo = sInfo; appInfo = sInfo.applicationInfo; @@ -618,7 +621,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN // those dirty apps we will create a notification clearly // blaming the app. Slog.v(TAG, "Attempted to start a foreground service (" - + name + + shortInstanceName + ") with a broken notification (no icon: " + localForegroundNoti + ")"); @@ -701,7 +704,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN Slog.w(TAG, "Error showing notification for service", e); // If it gave us a garbage notification, it doesn't // get to be foreground. - ams.setServiceForeground(name, ServiceRecord.this, + ams.setServiceForeground(instanceName, ServiceRecord.this, 0, null, 0); ams.crashApplication(appUid, appPid, localPackageName, -1, "Bad notification for startForeground: " + e); @@ -773,7 +776,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN sb.append("ServiceRecord{") .append(Integer.toHexString(System.identityHashCode(this))) .append(" u").append(userId) - .append(' ').append(shortName).append('}'); + .append(' ').append(shortInstanceName).append('}'); return stringName = sb.toString(); } diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 4c93441b5c7b..6009bd3e2c82 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -2637,7 +2637,7 @@ public final class Settings { } for (final SharedUserSetting sus : mSharedUsers.values()) { - knownSet.remove(sus.getSandboxName()); + knownSet.remove(sus.getStorageSandboxName()); } // Remove any unclaimed mappings @@ -2653,7 +2653,8 @@ public final class Settings { void writeKernelMappingLPr(SharedUserSetting sus) { if (mKernelMappingFilename == null || sus == null || sus.name == null) return; - writeKernelMappingLPr(sus.getSandboxName(), sus.userId, sus.getNotInstalledUserIds()); + writeKernelMappingLPr(sus.getStorageSandboxName(), + sus.userId, sus.getNotInstalledUserIds()); } void writeKernelMappingLPr(PackageSetting ps) { diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java index 32826e51f0a4..d67144e8ce39 100644 --- a/services/core/java/com/android/server/pm/SharedUserSetting.java +++ b/services/core/java/com/android/server/pm/SharedUserSetting.java @@ -19,6 +19,7 @@ package com.android.server.pm; import android.annotation.Nullable; import android.content.pm.ApplicationInfo; import android.content.pm.PackageParser; +import android.os.storage.StorageManager; import android.service.pm.PackageServiceDumpProto; import android.util.ArraySet; import android.util.proto.ProtoOutputStream; @@ -166,8 +167,8 @@ public final class SharedUserSetting extends SettingBase { return excludedUserIds == null ? EmptyArray.INT : excludedUserIds; } - public String getSandboxName() { - return "shared:" + name; + public String getStorageSandboxName() { + return StorageManager.SHARED_SANDBOX_PREFIX + name; } /** Updates all fields in this shared user setting from another. */ diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 10121c43e335..3e07ebea6a17 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -37,6 +37,7 @@ import android.os.UserHandle; import android.service.notification.NotificationStats; import android.text.TextUtils; import android.util.ArrayMap; +import android.util.Log; import android.util.Slog; import com.android.internal.R; @@ -671,6 +672,20 @@ public class StatusBarManagerService extends IStatusBarService.Stub { // Ensure state for the current user is applied, even if passed a non-current user. final int net1 = gatherDisableActionsLocked(mCurrentUserId, 1); final int net2 = gatherDisableActionsLocked(mCurrentUserId, 2); + + // TODO(b/113914868): investigation log for disappearing home button + if (whichFlag == 1 && pkg.contains("systemui")) { + String disabledData = "{ "; + for (int i = 0; i < mDisableRecords.size(); i++) { + DisableRecord tok = mDisableRecords.get(i); + disabledData += " ([" + i + "] " + tok + "), "; + } + disabledData += " }"; + Log.d(TAG, "disabledlocked (b/113914868): net1=" + net1 + ", mDisabled1=" + mDisabled1 + + ", token=" + token + ", mDisableRecords=" + mDisableRecords.size() + " => " + + disabledData); + } + if (net1 != mDisabled1 || net2 != mDisabled2) { mDisabled1 = net1; mDisabled2 = net2; diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index 3accaf8c1f98..cc14afce7ff6 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -126,9 +126,10 @@ class Dimmer { DimState(SurfaceControl dimLayer) { mDimLayer = dimLayer; mDimming = true; - mSurfaceAnimator = new SurfaceAnimator(new DimAnimatable(dimLayer), () -> { + final DimAnimatable dimAnimatable = new DimAnimatable(dimLayer); + mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> { if (!mDimming) { - mDimLayer.destroy(); + dimAnimatable.getPendingTransaction().destroy(mDimLayer); } }, mHost.mService); } diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java new file mode 100644 index 000000000000..77b734785424 --- /dev/null +++ b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java @@ -0,0 +1,232 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.android.server.backup.testing.CryptoTestUtils.generateAesKey; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import android.platform.test.annotations.Presubmit; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Random; + +import javax.crypto.SecretKey; + +/** Tests for {@link ContentDefinedChunker}. */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class ContentDefinedChunkerTest { + private static final int WINDOW_SIZE_BYTES = 31; + private static final int MIN_SIZE_BYTES = 40; + private static final int MAX_SIZE_BYTES = 300; + private static final String CHUNK_BOUNDARY = "<----------BOUNDARY----------->"; + private static final byte[] CHUNK_BOUNDARY_BYTES = CHUNK_BOUNDARY.getBytes(UTF_8); + private static final String CHUNK_1 = "This is the first chunk"; + private static final String CHUNK_2 = "And this is the second chunk"; + private static final String CHUNK_3 = "And finally here is the third chunk"; + private static final String SMALL_CHUNK = "12345678"; + + private FingerprintMixer mFingerprintMixer; + private RabinFingerprint64 mRabinFingerprint64; + private ContentDefinedChunker mChunker; + + /** Set up a {@link ContentDefinedChunker} and dependencies for use in the tests. */ + @Before + public void setUp() throws Exception { + SecretKey secretKey = generateAesKey(); + byte[] salt = new byte[FingerprintMixer.SALT_LENGTH_BYTES]; + Random random = new Random(); + random.nextBytes(salt); + mFingerprintMixer = new FingerprintMixer(secretKey, salt); + + mRabinFingerprint64 = new RabinFingerprint64(); + long chunkBoundaryFingerprint = calculateFingerprint(CHUNK_BOUNDARY_BYTES); + mChunker = + new ContentDefinedChunker( + MIN_SIZE_BYTES, + MAX_SIZE_BYTES, + mRabinFingerprint64, + mFingerprintMixer, + (fingerprint) -> fingerprint == chunkBoundaryFingerprint); + } + + /** + * Creating a {@link ContentDefinedChunker} with a minimum chunk size that is smaller than the + * window size should throw an {@link IllegalArgumentException}. + */ + @Test + public void create_withMinChunkSizeSmallerThanWindowSize_throwsIllegalArgumentException() { + assertThrows( + IllegalArgumentException.class, + () -> + new ContentDefinedChunker( + WINDOW_SIZE_BYTES - 1, + MAX_SIZE_BYTES, + mRabinFingerprint64, + mFingerprintMixer, + null)); + } + + /** + * Creating a {@link ContentDefinedChunker} with a maximum chunk size that is smaller than the + * minimum chunk size should throw an {@link IllegalArgumentException}. + */ + @Test + public void create_withMaxChunkSizeSmallerThanMinChunkSize_throwsIllegalArgumentException() { + assertThrows( + IllegalArgumentException.class, + () -> + new ContentDefinedChunker( + MIN_SIZE_BYTES, + MIN_SIZE_BYTES - 1, + mRabinFingerprint64, + mFingerprintMixer, + null)); + } + + /** + * {@link ContentDefinedChunker#chunkify(InputStream, Chunker.ChunkConsumer)} should split the + * input stream across chunk boundaries by default. + */ + @Test + public void chunkify_withLargeChunks_splitsIntoChunksAcrossBoundaries() throws Exception { + byte[] input = + (CHUNK_1 + CHUNK_BOUNDARY + CHUNK_2 + CHUNK_BOUNDARY + CHUNK_3).getBytes(UTF_8); + ByteArrayInputStream inputStream = new ByteArrayInputStream(input); + ArrayList<String> result = new ArrayList<>(); + + mChunker.chunkify(inputStream, (chunk) -> result.add(new String(chunk, UTF_8))); + + assertThat(result) + .containsExactly(CHUNK_1 + CHUNK_BOUNDARY, CHUNK_2 + CHUNK_BOUNDARY, CHUNK_3) + .inOrder(); + } + + /** Chunks should be combined across boundaries until they reach the minimum chunk size. */ + @Test + public void chunkify_withSmallChunks_combinesChunksUntilMinSize() throws Exception { + byte[] input = + (SMALL_CHUNK + CHUNK_BOUNDARY + CHUNK_2 + CHUNK_BOUNDARY + CHUNK_3).getBytes(UTF_8); + ByteArrayInputStream inputStream = new ByteArrayInputStream(input); + ArrayList<String> result = new ArrayList<>(); + + mChunker.chunkify(inputStream, (chunk) -> result.add(new String(chunk, UTF_8))); + + assertThat(result) + .containsExactly(SMALL_CHUNK + CHUNK_BOUNDARY + CHUNK_2 + CHUNK_BOUNDARY, CHUNK_3) + .inOrder(); + assertThat(result.get(0).length()).isAtLeast(MIN_SIZE_BYTES); + } + + /** Chunks can not be larger than the maximum chunk size. */ + @Test + public void chunkify_doesNotProduceChunksLargerThanMaxSize() throws Exception { + byte[] largeInput = new byte[MAX_SIZE_BYTES * 10]; + Arrays.fill(largeInput, "a".getBytes(UTF_8)[0]); + ByteArrayInputStream inputStream = new ByteArrayInputStream(largeInput); + ArrayList<String> result = new ArrayList<>(); + + mChunker.chunkify(inputStream, (chunk) -> result.add(new String(chunk, UTF_8))); + + byte[] expectedChunkBytes = new byte[MAX_SIZE_BYTES]; + Arrays.fill(expectedChunkBytes, "a".getBytes(UTF_8)[0]); + String expectedChunk = new String(expectedChunkBytes, UTF_8); + assertThat(result) + .containsExactly( + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk, + expectedChunk) + .inOrder(); + } + + /** + * If the input stream signals zero availablility, {@link + * ContentDefinedChunker#chunkify(InputStream, Chunker.ChunkConsumer)} should still work. + */ + @Test + public void chunkify_withInputStreamReturningZeroAvailability_returnsChunks() throws Exception { + byte[] input = (SMALL_CHUNK + CHUNK_BOUNDARY + CHUNK_2).getBytes(UTF_8); + ZeroAvailabilityInputStream zeroAvailabilityInputStream = + new ZeroAvailabilityInputStream(input); + ArrayList<String> result = new ArrayList<>(); + + mChunker.chunkify( + zeroAvailabilityInputStream, (chunk) -> result.add(new String(chunk, UTF_8))); + + assertThat(result).containsExactly(SMALL_CHUNK + CHUNK_BOUNDARY + CHUNK_2).inOrder(); + } + + /** + * {@link ContentDefinedChunker#chunkify(InputStream, Chunker.ChunkConsumer)} should rethrow any + * exception thrown by its consumer. + */ + @Test + public void chunkify_whenConsumerThrowsException_rethrowsException() throws Exception { + ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[] {1}); + + assertThrows( + GeneralSecurityException.class, + () -> + mChunker.chunkify( + inputStream, + (chunk) -> { + throw new GeneralSecurityException(); + })); + } + + private long calculateFingerprint(byte[] bytes) { + long fingerprint = 0; + for (byte inByte : bytes) { + fingerprint = + mRabinFingerprint64.computeFingerprint64( + /*inChar=*/ inByte, /*outChar=*/ (byte) 0, fingerprint); + } + return mFingerprintMixer.mix(fingerprint); + } + + private static class ZeroAvailabilityInputStream extends ByteArrayInputStream { + ZeroAvailabilityInputStream(byte[] wrapped) { + super(wrapped); + } + + @Override + public synchronized int available() { + return 0; + } + } +} diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java new file mode 100644 index 000000000000..936b5dca033d --- /dev/null +++ b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; + +import android.platform.test.annotations.Presubmit; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.security.InvalidKeyException; +import java.security.Key; +import java.util.HashSet; +import java.util.Random; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +/** Tests for {@link FingerprintMixer}. */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class FingerprintMixerTest { + private static final String KEY_ALGORITHM = "AES"; + private static final int SEED = 42; + private static final int SALT_LENGTH_BYTES = 256 / 8; + private static final int KEY_SIZE_BITS = 256; + + private Random mSeededRandom; + private FingerprintMixer mFingerprintMixer; + + /** Set up a {@link FingerprintMixer} with deterministic key and salt generation. */ + @Before + public void setUp() throws Exception { + // Seed so that the tests are deterministic. + mSeededRandom = new Random(SEED); + mFingerprintMixer = new FingerprintMixer(randomKey(), randomSalt()); + } + + /** + * Construcing a {@link FingerprintMixer} with a salt that is too small should throw an {@link + * IllegalArgumentException}. + */ + @Test + public void create_withIncorrectSaltSize_throwsIllegalArgumentException() { + byte[] tooSmallSalt = new byte[SALT_LENGTH_BYTES - 1]; + + assertThrows( + IllegalArgumentException.class, + () -> new FingerprintMixer(randomKey(), tooSmallSalt)); + } + + /** + * Constructing a {@link FingerprintMixer} with a secret key that can't be encoded should throw + * an {@link InvalidKeyException}. + */ + @Test + public void create_withUnencodableSecretKey_throwsInvalidKeyException() { + byte[] keyBytes = new byte[KEY_SIZE_BITS / 8]; + UnencodableSecretKeySpec keySpec = + new UnencodableSecretKeySpec(keyBytes, 0, keyBytes.length, KEY_ALGORITHM); + + assertThrows(InvalidKeyException.class, () -> new FingerprintMixer(keySpec, randomSalt())); + } + + /** + * {@link FingerprintMixer#getAddend()} should not return the same addend for two different + * keys. + */ + @Test + public void getAddend_withDifferentKey_returnsDifferentResult() throws Exception { + int iterations = 100_000; + HashSet<Long> returnedAddends = new HashSet<>(); + byte[] salt = randomSalt(); + + for (int i = 0; i < iterations; i++) { + FingerprintMixer fingerprintMixer = new FingerprintMixer(randomKey(), salt); + long addend = fingerprintMixer.getAddend(); + returnedAddends.add(addend); + } + + assertThat(returnedAddends).containsNoDuplicates(); + } + + /** + * {@link FingerprintMixer#getMultiplicand()} should not return the same multiplicand for two + * different keys. + */ + @Test + public void getMultiplicand_withDifferentKey_returnsDifferentResult() throws Exception { + int iterations = 100_000; + HashSet<Long> returnedMultiplicands = new HashSet<>(); + byte[] salt = randomSalt(); + + for (int i = 0; i < iterations; i++) { + FingerprintMixer fingerprintMixer = new FingerprintMixer(randomKey(), salt); + long multiplicand = fingerprintMixer.getMultiplicand(); + returnedMultiplicands.add(multiplicand); + } + + assertThat(returnedMultiplicands).containsNoDuplicates(); + } + + /** The multiplicant returned by {@link FingerprintMixer} should always be odd. */ + @Test + public void getMultiplicand_isOdd() throws Exception { + int iterations = 100_000; + + for (int i = 0; i < iterations; i++) { + FingerprintMixer fingerprintMixer = new FingerprintMixer(randomKey(), randomSalt()); + + long multiplicand = fingerprintMixer.getMultiplicand(); + + assertThat(isOdd(multiplicand)).isTrue(); + } + } + + /** {@link FingerprintMixer#mix(long)} should have a random distribution. */ + @Test + public void mix_randomlyDistributesBits() throws Exception { + int iterations = 100_000; + float tolerance = 0.1f; + int[] totals = new int[64]; + + for (int i = 0; i < iterations; i++) { + long n = mFingerprintMixer.mix(mSeededRandom.nextLong()); + for (int j = 0; j < 64; j++) { + int bit = (int) (n >> j & 1); + totals[j] += bit; + } + } + + for (int i = 0; i < 64; i++) { + float mean = ((float) totals[i]) / iterations; + float diff = Math.abs(mean - 0.5f); + assertThat(diff).isLessThan(tolerance); + } + } + + /** + * {@link FingerprintMixer#mix(long)} should always produce a number that's different from the + * input. + */ + @Test + public void mix_doesNotProduceSameNumberAsInput() { + int iterations = 100_000; + + for (int i = 0; i < iterations; i++) { + assertThat(mFingerprintMixer.mix(i)).isNotEqualTo(i); + } + } + + private byte[] randomSalt() { + byte[] salt = new byte[SALT_LENGTH_BYTES]; + mSeededRandom.nextBytes(salt); + return salt; + } + + /** + * Not a secure way of generating keys. We want to deterministically generate the same keys for + * each test run, though, to ensure the test is deterministic. + */ + private SecretKey randomKey() { + byte[] keyBytes = new byte[KEY_SIZE_BITS / 8]; + mSeededRandom.nextBytes(keyBytes); + return new SecretKeySpec(keyBytes, 0, keyBytes.length, KEY_ALGORITHM); + } + + private static boolean isOdd(long n) { + return Math.abs(n % 2) == 1; + } + + /** + * Subclass of {@link SecretKeySpec} that does not provide an encoded version. As per its + * contract in {@link Key}, that means {@code getEncoded()} always returns null. + */ + private class UnencodableSecretKeySpec extends SecretKeySpec { + UnencodableSecretKeySpec(byte[] key, int offset, int len, String algorithm) { + super(key, offset, len, algorithm); + } + + @Override + public byte[] getEncoded() { + return null; + } + } +} diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java new file mode 100644 index 000000000000..549437454e9c --- /dev/null +++ b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; + +import android.platform.test.annotations.Presubmit; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +/** Tests for {@link Hkdf}. */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class HkdfTest { + /** HKDF Test Case 1 IKM from RFC 5869 */ + private static final byte[] HKDF_CASE1_IKM = { + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b + }; + + /** HKDF Test Case 1 salt from RFC 5869 */ + private static final byte[] HKDF_CASE1_SALT = { + 0x00, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0a, 0x0b, 0x0c + }; + + /** HKDF Test Case 1 info from RFC 5869 */ + private static final byte[] HKDF_CASE1_INFO = { + (byte) 0xf0, (byte) 0xf1, (byte) 0xf2, (byte) 0xf3, (byte) 0xf4, + (byte) 0xf5, (byte) 0xf6, (byte) 0xf7, (byte) 0xf8, (byte) 0xf9 + }; + + /** First 32 bytes of HKDF Test Case 1 OKM (output) from RFC 5869 */ + private static final byte[] HKDF_CASE1_OKM = { + (byte) 0x3c, (byte) 0xb2, (byte) 0x5f, (byte) 0x25, (byte) 0xfa, + (byte) 0xac, (byte) 0xd5, (byte) 0x7a, (byte) 0x90, (byte) 0x43, + (byte) 0x4f, (byte) 0x64, (byte) 0xd0, (byte) 0x36, (byte) 0x2f, + (byte) 0x2a, (byte) 0x2d, (byte) 0x2d, (byte) 0x0a, (byte) 0x90, + (byte) 0xcf, (byte) 0x1a, (byte) 0x5a, (byte) 0x4c, (byte) 0x5d, + (byte) 0xb0, (byte) 0x2d, (byte) 0x56, (byte) 0xec, (byte) 0xc4, + (byte) 0xc5, (byte) 0xbf + }; + + /** Test the example from RFC 5869. */ + @Test + public void hkdf_derivesKeyMaterial() throws Exception { + byte[] result = Hkdf.hkdf(HKDF_CASE1_IKM, HKDF_CASE1_SALT, HKDF_CASE1_INFO); + + assertThat(result).isEqualTo(HKDF_CASE1_OKM); + } + + /** Providing a key that is null should throw a {@link java.lang.NullPointerException}. */ + @Test + public void hkdf_withNullKey_throwsNullPointerException() throws Exception { + assertThrows( + NullPointerException.class, + () -> Hkdf.hkdf(null, HKDF_CASE1_SALT, HKDF_CASE1_INFO)); + } + + /** Providing a salt that is null should throw a {@link java.lang.NullPointerException}. */ + @Test + public void hkdf_withNullSalt_throwsNullPointerException() throws Exception { + assertThrows( + NullPointerException.class, () -> Hkdf.hkdf(HKDF_CASE1_IKM, null, HKDF_CASE1_INFO)); + } + + /** Providing data that is null should throw a {@link java.lang.NullPointerException}. */ + @Test + public void hkdf_withNullData_throwsNullPointerException() throws Exception { + assertThrows( + NullPointerException.class, () -> Hkdf.hkdf(HKDF_CASE1_IKM, HKDF_CASE1_SALT, null)); + } +} diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java new file mode 100644 index 000000000000..277dc372e73c --- /dev/null +++ b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; + +import android.platform.test.annotations.Presubmit; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.util.Random; + +/** Tests for {@link IsChunkBreakpoint}. */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class IsChunkBreakpointTest { + private static final int RANDOM_SEED = 42; + private static final double TOLERANCE = 0.01; + private static final int NUMBER_OF_TESTS = 10000; + private static final int BITS_PER_LONG = 64; + + private Random mRandom; + + /** Make sure that tests are deterministic. */ + @Before + public void setUp() { + mRandom = new Random(RANDOM_SEED); + } + + /** + * Providing a negative average number of trials should throw an {@link + * IllegalArgumentException}. + */ + @Test + public void create_withNegativeAverageNumberOfTrials_throwsIllegalArgumentException() { + assertThrows(IllegalArgumentException.class, () -> new IsChunkBreakpoint(-1)); + } + + // Note: the following three tests are compute-intensive, so be cautious adding more. + + /** + * If the provided average number of trials is zero, a breakpoint should be expected after one + * trial on average. + */ + @Test + public void + isBreakpoint_withZeroAverageNumberOfTrials_isTrueOnAverageAfterOneTrial() { + assertExpectedTrials(new IsChunkBreakpoint(0), /*expectedTrials=*/ 1); + } + + /** + * If the provided average number of trials is 512, a breakpoint should be expected after 512 + * trials on average. + */ + @Test + public void + isBreakpoint_with512AverageNumberOfTrials_isTrueOnAverageAfter512Trials() { + assertExpectedTrials(new IsChunkBreakpoint(512), /*expectedTrials=*/ 512); + } + + /** + * If the provided average number of trials is 1024, a breakpoint should be expected after 1024 + * trials on average. + */ + @Test + public void + isBreakpoint_with1024AverageNumberOfTrials_isTrueOnAverageAfter1024Trials() { + assertExpectedTrials(new IsChunkBreakpoint(1024), /*expectedTrials=*/ 1024); + } + + /** The number of leading zeros should be the logarithm of the average number of trials. */ + @Test + public void getLeadingZeros_squaredIsAverageNumberOfTrials() { + for (int i = 0; i < BITS_PER_LONG; i++) { + long averageNumberOfTrials = (long) Math.pow(2, i); + + int leadingZeros = new IsChunkBreakpoint(averageNumberOfTrials).getLeadingZeros(); + + assertThat(leadingZeros).isEqualTo(i); + } + } + + private void assertExpectedTrials(IsChunkBreakpoint isChunkBreakpoint, long expectedTrials) { + long sum = 0; + for (int i = 0; i < NUMBER_OF_TESTS; i++) { + sum += numberOfTrialsTillBreakpoint(isChunkBreakpoint); + } + long averageTrials = sum / NUMBER_OF_TESTS; + assertThat((double) Math.abs(averageTrials - expectedTrials)) + .isLessThan(TOLERANCE * expectedTrials); + } + + private int numberOfTrialsTillBreakpoint(IsChunkBreakpoint isChunkBreakpoint) { + int trials = 0; + + while (true) { + trials++; + if (isChunkBreakpoint.isBreakpoint(mRandom.nextLong())) { + return trials; + } + } + } +} diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java new file mode 100644 index 000000000000..729580cf5101 --- /dev/null +++ b/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.backup.encryption.chunking.cdc; + +import static com.google.common.truth.Truth.assertThat; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import android.platform.test.annotations.Presubmit; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +/** Tests for {@link RabinFingerprint64}. */ +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class RabinFingerprint64Test { + private static final int WINDOW_SIZE = 31; + private static final ImmutableList<String> TEST_STRINGS = + ImmutableList.of( + "ervHTtChYXO6eXivYqThlyyzqkbRaOR", + "IxaVunH9ZC3qneWfhj1GkBH4ys9CYqz", + "wZRVjlE1p976icCFPX9pibk4PEBvjSH", + "pHIVaT8x8If9D6s9croksgNmJpmGYWI"); + + private final RabinFingerprint64 mRabinFingerprint64 = new RabinFingerprint64(); + + /** + * No matter where in the input buffer a string occurs, {@link + * RabinFingerprint64#computeFingerprint64(byte, byte, long)} should return the same + * fingerprint. + */ + @Test + public void computeFingerprint64_forSameWindow_returnsSameFingerprint() { + long fingerprint1 = + computeFingerprintAtPosition(getBytes(TEST_STRINGS.get(0)), WINDOW_SIZE - 1); + long fingerprint2 = + computeFingerprintAtPosition( + getBytes(TEST_STRINGS.get(1), TEST_STRINGS.get(0)), WINDOW_SIZE * 2 - 1); + long fingerprint3 = + computeFingerprintAtPosition( + getBytes(TEST_STRINGS.get(2), TEST_STRINGS.get(3), TEST_STRINGS.get(0)), + WINDOW_SIZE * 3 - 1); + String stub = "abc"; + long fingerprint4 = + computeFingerprintAtPosition( + getBytes(stub, TEST_STRINGS.get(0)), WINDOW_SIZE + stub.length() - 1); + + // Assert that all fingerprints are exactly the same + assertThat(ImmutableSet.of(fingerprint1, fingerprint2, fingerprint3, fingerprint4)) + .hasSize(1); + } + + /** The computed fingerprint should be different for different inputs. */ + @Test + public void computeFingerprint64_withDifferentInput_returnsDifferentFingerprint() { + long fingerprint1 = computeFingerprintOf(TEST_STRINGS.get(0)); + long fingerprint2 = computeFingerprintOf(TEST_STRINGS.get(1)); + long fingerprint3 = computeFingerprintOf(TEST_STRINGS.get(2)); + long fingerprint4 = computeFingerprintOf(TEST_STRINGS.get(3)); + + assertThat(ImmutableList.of(fingerprint1, fingerprint2, fingerprint3, fingerprint4)) + .containsNoDuplicates(); + } + + /** + * An input with the same characters in a different order should return a different fingerprint. + */ + @Test + public void computeFingerprint64_withSameInputInDifferentOrder_returnsDifferentFingerprint() { + long fingerprint1 = computeFingerprintOf("abcdefghijklmnopqrstuvwxyz12345"); + long fingerprint2 = computeFingerprintOf("54321zyxwvutsrqponmlkjihgfedcba"); + long fingerprint3 = computeFingerprintOf("4bcdefghijklmnopqrstuvwxyz123a5"); + long fingerprint4 = computeFingerprintOf("bacdefghijklmnopqrstuvwxyz12345"); + + assertThat(ImmutableList.of(fingerprint1, fingerprint2, fingerprint3, fingerprint4)) + .containsNoDuplicates(); + } + + /** UTF-8 bytes of all the given strings in order. */ + private byte[] getBytes(String... strings) { + StringBuilder sb = new StringBuilder(); + for (String s : strings) { + sb.append(s); + } + return sb.toString().getBytes(UTF_8); + } + + /** + * The Rabin fingerprint of a window of bytes ending at {@code position} in the {@code bytes} + * array. + */ + private long computeFingerprintAtPosition(byte[] bytes, int position) { + assertThat(position).isAtMost(bytes.length - 1); + long fingerprint = 0; + for (int i = 0; i <= position; i++) { + byte outChar; + if (i >= WINDOW_SIZE) { + outChar = bytes[i - WINDOW_SIZE]; + } else { + outChar = (byte) 0; + } + fingerprint = + mRabinFingerprint64.computeFingerprint64( + /*inChar=*/ bytes[i], outChar, fingerprint); + } + return fingerprint; + } + + private long computeFingerprintOf(String s) { + assertThat(s.length()).isEqualTo(WINDOW_SIZE); + return computeFingerprintAtPosition(s.getBytes(UTF_8), WINDOW_SIZE - 1); + } +} diff --git a/services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java index ee42ce8b591a..e6b328a128b7 100644 --- a/services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java @@ -125,7 +125,7 @@ public class StorageManagerServiceTest { "/storage/emulated/0/foo.jpg", PID_GREY, UID_GREY); assertTranslation( - "/storage/emulated/0/Android/sandbox/shared:colors/foo.jpg", + "/storage/emulated/0/Android/sandbox/shared-colors/foo.jpg", "/storage/emulated/0/foo.jpg", PID_RED, UID_COLORS); } @@ -137,7 +137,7 @@ public class StorageManagerServiceTest { "/storage/0000-0000/foo/bar.jpg", PID_GREY, UID_GREY); assertTranslation( - "/storage/0000-0000/Android/sandbox/shared:colors/foo/bar.jpg", + "/storage/0000-0000/Android/sandbox/shared-colors/foo/bar.jpg", "/storage/0000-0000/foo/bar.jpg", PID_RED, UID_COLORS); } @@ -152,7 +152,7 @@ public class StorageManagerServiceTest { // Accessing other package paths goes into sandbox assertTranslation( - "/storage/emulated/0/Android/sandbox/shared:colors/" + "/storage/emulated/0/Android/sandbox/shared-colors/" + "Android/data/com.grey/foo.jpg", "/storage/emulated/0/Android/data/com.grey/foo.jpg", PID_RED, UID_COLORS); @@ -201,7 +201,7 @@ public class StorageManagerServiceTest { // Sandboxes can't see paths in other sandboxes try { mService.translateSystemToApp( - "/storage/emulated/0/Android/sandbox/shared:colors/foo.jpg", + "/storage/emulated/0/Android/sandbox/shared-colors/foo.jpg", PID_GREY, UID_GREY); fail(); } catch (SecurityException expected) { diff --git a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java index b6a7cfba7dc4..991981f62d30 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java @@ -37,7 +37,7 @@ import org.junit.Test; /** * Build/Install/Run: - * atest FrameworksServicesTests:DimmerTests; + * atest FrameworksServicesTests:DimmerTests */ @Presubmit public class DimmerTests extends WindowTestsBase { @@ -211,7 +211,7 @@ public class DimmerTests extends WindowTestsBase { mDimmer.updateDims(mTransaction, new Rect()); verify(mSurfaceAnimatorStarter).startAnimation(any(SurfaceAnimator.class), any( SurfaceControl.Transaction.class), any(AnimationAdapter.class), anyBoolean()); - verify(dimLayer).destroy(); + verify(mHost.getPendingTransaction()).destroy(dimLayer); } @Test diff --git a/telephony/java/android/telephony/CellConfigLte.java b/telephony/java/android/telephony/CellConfigLte.java new file mode 100644 index 000000000000..35769f04c5ae --- /dev/null +++ b/telephony/java/android/telephony/CellConfigLte.java @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telephony; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Objects; + +/** + * The container of LTE cell related configs. + * @hide + */ +public class CellConfigLte implements Parcelable { + private final boolean mIsEndcAvailable; + + /** @hide */ + public CellConfigLte() { + mIsEndcAvailable = false; + } + + /** @hide */ + public CellConfigLte(boolean isEndcAvailable) { + mIsEndcAvailable = isEndcAvailable; + } + + /** @hide */ + public CellConfigLte(CellConfigLte config) { + mIsEndcAvailable = config.mIsEndcAvailable; + } + + /** + * Indicates that if E-UTRA-NR Dual Connectivity (EN-DC) is supported by the LTE cell. + * + * Reference: 3GPP TS 36.331 v15.2.2 6.3.1 System information blocks. + * + * @return {@code true} if E-UTRA-NR Dual Connectivity (EN-DC) is supported by the LTE cell. + * + */ + boolean isEndcAvailable() { + return mIsEndcAvailable; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public int hashCode() { + return Objects.hash(mIsEndcAvailable); + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof CellConfigLte)) return false; + + CellConfigLte o = (CellConfigLte) other; + return mIsEndcAvailable == o.mIsEndcAvailable; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeBoolean(mIsEndcAvailable); + } + + @Override + public String toString() { + return new StringBuilder().append(this.getClass().getName()) + .append(" :{") + .append(" isEndcAvailable = " + mIsEndcAvailable) + .append(" }") + .toString(); + } + + private CellConfigLte(Parcel in) { + mIsEndcAvailable = in.readBoolean(); + } + + public static final Creator<CellConfigLte> CREATOR = new Creator<CellConfigLte>() { + @Override + public CellConfigLte createFromParcel(Parcel in) { + return new CellConfigLte(in); + } + + @Override + public CellConfigLte[] newArray(int size) { + return new CellConfigLte[0]; + } + }; +} diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 389f643e05a4..7d5388b7b7f4 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -19,7 +19,8 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; -import android.telephony.Rlog; + +import java.util.Objects; /** * A {@link CellInfo} representing an LTE cell that provides identity and measurement info. @@ -31,6 +32,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { private CellIdentityLte mCellIdentityLte; private CellSignalStrengthLte mCellSignalStrengthLte; + private CellConfigLte mCellConfig; /** @hide */ @UnsupportedAppUsage @@ -38,6 +40,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { super(); mCellIdentityLte = new CellIdentityLte(); mCellSignalStrengthLte = new CellSignalStrengthLte(); + mCellConfig = new CellConfigLte(); } /** @hide */ @@ -45,6 +48,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { super(ci); this.mCellIdentityLte = ci.mCellIdentityLte.copy(); this.mCellSignalStrengthLte = ci.mCellSignalStrengthLte.copy(); + this.mCellConfig = new CellConfigLte(ci.mCellConfig); } @Override @@ -71,26 +75,37 @@ public final class CellInfoLte extends CellInfo implements Parcelable { mCellSignalStrengthLte = css; } + /** @hide */ + public void setCellConfig(CellConfigLte cellConfig) { + if (DBG) log("setCellConfig: " + cellConfig); + mCellConfig = cellConfig; + } + + /** @hide */ + public CellConfigLte getCellConfig() { + if (DBG) log("getCellConfig: " + mCellConfig); + return mCellConfig; + } + /** * @return hash code */ @Override public int hashCode() { - return super.hashCode() + mCellIdentityLte.hashCode() + mCellSignalStrengthLte.hashCode(); + return Objects.hash( + super.hashCode(), + mCellIdentityLte.hashCode(), + mCellSignalStrengthLte.hashCode(), + mCellConfig.hashCode()); } @Override public boolean equals(Object other) { - if (!super.equals(other)) { - return false; - } - try { - CellInfoLte o = (CellInfoLte) other; - return mCellIdentityLte.equals(o.mCellIdentityLte) - && mCellSignalStrengthLte.equals(o.mCellSignalStrengthLte); - } catch (ClassCastException e) { - return false; - } + if (!(other instanceof CellInfoLte)) return false; + CellInfoLte o = (CellInfoLte) other; + return super.equals(o) && mCellIdentityLte.equals(o.mCellIdentityLte) + && mCellSignalStrengthLte.equals(o.mCellSignalStrengthLte) + && mCellConfig.equals(o.mCellConfig); } @Override @@ -101,6 +116,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { sb.append(super.toString()); sb.append(" ").append(mCellIdentityLte); sb.append(" ").append(mCellSignalStrengthLte); + sb.append(" ").append(mCellConfig); sb.append("}"); return sb.toString(); @@ -119,6 +135,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { super.writeToParcel(dest, flags, TYPE_LTE); mCellIdentityLte.writeToParcel(dest, flags); mCellSignalStrengthLte.writeToParcel(dest, flags); + mCellConfig.writeToParcel(dest, flags); } /** @@ -129,6 +146,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { super(in); mCellIdentityLte = CellIdentityLte.CREATOR.createFromParcel(in); mCellSignalStrengthLte = CellSignalStrengthLte.CREATOR.createFromParcel(in); + mCellConfig = CellConfigLte.CREATOR.createFromParcel(in); if (DBG) log("CellInfoLte(Parcel): " + toString()); } diff --git a/telephony/java/android/telephony/DataSpecificRegistrationStates.java b/telephony/java/android/telephony/DataSpecificRegistrationStates.java index 97e3037b3c90..b6e6cbae8c26 100644 --- a/telephony/java/android/telephony/DataSpecificRegistrationStates.java +++ b/telephony/java/android/telephony/DataSpecificRegistrationStates.java @@ -17,17 +17,40 @@ public class DataSpecificRegistrationStates implements Parcelable{ */ public final int maxDataCalls; - DataSpecificRegistrationStates(int maxDataCalls) { + /** + * Indicates if the use of dual connectivity with NR is restricted. + * Reference: 3GPP TS 24.301 v15.03 section 9.3.3.12A. + */ + public final boolean isDcNrRestricted; + + /** + * Indicates if NR is supported by the selected PLMN. + * + * {@code true} if the bit N is in the PLMN-InfoList-r15 is true and the selected PLMN is + * present in plmn-IdentityList at position N. + * Reference: 3GPP TS 36.331 v15.2.2 section 6.3.1 PLMN-InfoList-r15. + * 3GPP TS 36.331 v15.2.2 section 6.2.2 SystemInformationBlockType1 message. + */ + public final boolean isNrAvailable; + + DataSpecificRegistrationStates( + int maxDataCalls, boolean isDcNrRestricted, boolean isNrAvailable) { this.maxDataCalls = maxDataCalls; + this.isDcNrRestricted = isDcNrRestricted; + this.isNrAvailable = isNrAvailable; } private DataSpecificRegistrationStates(Parcel source) { maxDataCalls = source.readInt(); + isDcNrRestricted = source.readBoolean(); + isNrAvailable = source.readBoolean(); } @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(maxDataCalls); + dest.writeBoolean(isDcNrRestricted); + dest.writeBoolean(isNrAvailable); } @Override @@ -37,24 +60,30 @@ public class DataSpecificRegistrationStates implements Parcelable{ @Override public String toString() { - return "DataSpecificRegistrationStates {" + " mMaxDataCalls=" + maxDataCalls + "}"; + return new StringBuilder().append(this.getClass().getName()) + .append(" :{") + .append(" maxDataCalls = " + maxDataCalls) + .append(" isDcNrRestricted = " + isDcNrRestricted) + .append(" isNrAvailable = " + isNrAvailable) + .append(" }") + .toString(); } @Override public int hashCode() { - return Objects.hash(maxDataCalls); + return Objects.hash(maxDataCalls, isDcNrRestricted, isNrAvailable); } @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || !(o instanceof DataSpecificRegistrationStates)) { - return false; - } + if (!(o instanceof DataSpecificRegistrationStates)) return false; DataSpecificRegistrationStates other = (DataSpecificRegistrationStates) o; - return this.maxDataCalls == other.maxDataCalls; + return this.maxDataCalls == other.maxDataCalls + && this.isDcNrRestricted == other.isDcNrRestricted + && this.isNrAvailable == other.isNrAvailable; } public static final Parcelable.Creator<DataSpecificRegistrationStates> CREATOR = diff --git a/telephony/java/android/telephony/NetworkRegistrationState.java b/telephony/java/android/telephony/NetworkRegistrationState.java index 68e512eaff37..75e8eda33cdc 100644 --- a/telephony/java/android/telephony/NetworkRegistrationState.java +++ b/telephony/java/android/telephony/NetworkRegistrationState.java @@ -161,11 +161,9 @@ public class NetworkRegistrationState implements Parcelable { * @hide */ public NetworkRegistrationState(int domain, int transportType, int regState, - int accessNetworkTechnology, int rejectCause, - boolean emergencyOnly, int[] availableServices, - @Nullable CellIdentity cellIdentity, boolean cssSupported, - int roamingIndicator, int systemIsInPrl, - int defaultRoamingIndicator) { + int accessNetworkTechnology, int rejectCause, boolean emergencyOnly, + int[] availableServices, @Nullable CellIdentity cellIdentity, boolean cssSupported, + int roamingIndicator, int systemIsInPrl, int defaultRoamingIndicator) { this(domain, transportType, regState, accessNetworkTechnology, rejectCause, emergencyOnly, availableServices, cellIdentity); @@ -178,13 +176,14 @@ public class NetworkRegistrationState implements Parcelable { * @hide */ public NetworkRegistrationState(int domain, int transportType, int regState, - int accessNetworkTechnology, int rejectCause, - boolean emergencyOnly, int[] availableServices, - @Nullable CellIdentity cellIdentity, int maxDataCalls) { + int accessNetworkTechnology, int rejectCause, boolean emergencyOnly, + int[] availableServices, @Nullable CellIdentity cellIdentity, int maxDataCalls, + boolean isDcNrRestricted, boolean isNrAvailable) { this(domain, transportType, regState, accessNetworkTechnology, rejectCause, emergencyOnly, availableServices, cellIdentity); - mDataSpecificStates = new DataSpecificRegistrationStates(maxDataCalls); + mDataSpecificStates = new DataSpecificRegistrationStates( + maxDataCalls, isDcNrRestricted, isNrAvailable); } protected NetworkRegistrationState(Parcel source) { @@ -345,7 +344,7 @@ public class NetworkRegistrationState implements Parcelable { public boolean equals(Object o) { if (this == o) return true; - if (o == null || !(o instanceof NetworkRegistrationState)) { + if (!(o instanceof NetworkRegistrationState)) { return false; } @@ -357,11 +356,10 @@ public class NetworkRegistrationState implements Parcelable { && mAccessNetworkTechnology == other.mAccessNetworkTechnology && mRejectCause == other.mRejectCause && mEmergencyOnly == other.mEmergencyOnly - && (mAvailableServices == other.mAvailableServices - || Arrays.equals(mAvailableServices, other.mAvailableServices)) - && equals(mCellIdentity, other.mCellIdentity) - && equals(mVoiceSpecificStates, other.mVoiceSpecificStates) - && equals(mDataSpecificStates, other.mDataSpecificStates); + && Arrays.equals(mAvailableServices, other.mAvailableServices) + && Objects.equals(mCellIdentity, other.mCellIdentity) + && Objects.equals(mVoiceSpecificStates, other.mVoiceSpecificStates) + && Objects.equals(mDataSpecificStates, other.mDataSpecificStates); } @Override @@ -391,14 +389,4 @@ public class NetworkRegistrationState implements Parcelable { return new NetworkRegistrationState[size]; } }; - - private static boolean equals(Object o1, Object o2) { - if (o1 == o2) { - return true; - } else if (o1 == null) { - return false; - } else { - return o1.equals(o2); - } - } } diff --git a/test-mock/api/current.txt b/test-mock/api/current.txt index fc9b4c6831e8..f91d74a30693 100644 --- a/test-mock/api/current.txt +++ b/test-mock/api/current.txt @@ -31,6 +31,7 @@ package android.test.mock { public class MockContext extends android.content.Context { ctor public MockContext(); + method public boolean bindIsolatedService(android.content.Intent, android.content.ServiceConnection, int, java.lang.String); method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int); method public int checkCallingOrSelfPermission(java.lang.String); method public int checkCallingOrSelfUriPermission(android.net.Uri, int); diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index fa5b896ea126..66be6d9d9840 100644 --- a/test-mock/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java @@ -576,6 +576,13 @@ public class MockContext extends Context { throw new UnsupportedOperationException(); } + @Override + public boolean bindIsolatedService(Intent service, + ServiceConnection conn, int flags, + String instanceName) { + throw new UnsupportedOperationException(); + } + /** @hide */ @Override public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags, diff --git a/test-runner/src/android/test/IsolatedContext.java b/test-runner/src/android/test/IsolatedContext.java index 6e4c41eef81c..73db4517e130 100644 --- a/test-runner/src/android/test/IsolatedContext.java +++ b/test-runner/src/android/test/IsolatedContext.java @@ -75,6 +75,12 @@ public class IsolatedContext extends ContextWrapper { } @Override + public boolean bindIsolatedService(Intent service, ServiceConnection conn, int flags, + String instanceName) { + return false; + } + + @Override public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { return null; } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8fc9b9759469..b34ac264ade4 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -58,7 +58,7 @@ public class WifiConfiguration implements Parcelable { /** * Current Version of the Backup Serializer. */ - private static final int BACKUP_VERSION = 2; + private static final int BACKUP_VERSION = 3; /** {@hide} */ public static final String ssidVarName = "ssid"; /** {@hide} */ @@ -2420,6 +2420,7 @@ public class WifiConfiguration implements Parcelable { out.writeInt(apChannel); BackupUtils.writeString(out, preSharedKey); out.writeInt(getAuthType()); + out.writeBoolean(hiddenSSID); return baos.toByteArray(); } @@ -2442,6 +2443,9 @@ public class WifiConfiguration implements Parcelable { config.apChannel = in.readInt(); config.preSharedKey = BackupUtils.readString(in); config.allowedKeyManagement.set(in.readInt()); + if (version >= 3) { + config.hiddenSSID = in.readBoolean(); + } return config; } } diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index 5f3e1b27672e..bf6feac1aba7 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import android.net.MacAddress; +import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.os.Parcel; import android.support.test.filters.SmallTest; @@ -30,6 +31,9 @@ import android.support.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; + /** * Unit tests for {@link android.net.wifi.WifiConfiguration}. */ @@ -242,4 +246,30 @@ public class WifiConfigurationTest { config.setRandomizedMacAddress(null); assertEquals(defaultMac, config.getRandomizedMacAddress()); } + + /** + * Verifies that the serialization/de-serialization for softap config works. + */ + @Test + public void testSoftApConfigBackupAndRestore() throws Exception { + WifiConfiguration config = new WifiConfiguration(); + config.SSID = "TestAP"; + config.apBand = WifiConfiguration.AP_BAND_5GHZ; + config.apChannel = 40; + config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK); + config.preSharedKey = "TestPsk"; + config.hiddenSSID = true; + + byte[] data = config.getBytesForBackup(); + ByteArrayInputStream bais = new ByteArrayInputStream(data); + DataInputStream in = new DataInputStream(bais); + WifiConfiguration restoredConfig = WifiConfiguration.getWifiConfigFromBackup(in); + + assertEquals(config.SSID, restoredConfig.SSID); + assertEquals(config.preSharedKey, restoredConfig.preSharedKey); + assertEquals(config.getAuthType(), restoredConfig.getAuthType()); + assertEquals(config.apBand, restoredConfig.apBand); + assertEquals(config.apChannel, restoredConfig.apChannel); + assertEquals(config.hiddenSSID, restoredConfig.hiddenSSID); + } } |