diff options
39 files changed, 136 insertions, 144 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 1ec96ecc561b..9310762665db 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -81,7 +81,6 @@ import com.android.internal.app.IBatteryStats; import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; -import com.android.internal.util.Preconditions; import com.android.server.AppStateTracker; import com.android.server.DeviceIdleInternal; import com.android.server.FgThread; @@ -117,6 +116,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; import java.util.function.Predicate; @@ -1283,7 +1283,7 @@ public class JobSchedulerService extends com.android.server.SystemService super(context); mLocalPM = LocalServices.getService(PackageManagerInternal.class); - mActivityManagerInternal = Preconditions.checkNotNull( + mActivityManagerInternal = Objects.requireNonNull( LocalServices.getService(ActivityManagerInternal.class)); mHandler = new JobHandler(context.getMainLooper()); @@ -1389,7 +1389,7 @@ public class JobSchedulerService extends com.android.server.SystemService controller.onSystemServicesReady(); } - mAppStateTracker = Preconditions.checkNotNull( + mAppStateTracker = Objects.requireNonNull( LocalServices.getService(AppStateTracker.class)); // Register br for package removals and user removals. diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java index 8b610061d3aa..aa3d74a51ff2 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java @@ -23,7 +23,6 @@ import android.util.Slog; import android.util.proto.ProtoOutputStream; import com.android.internal.util.IndentingPrintWriter; -import com.android.internal.util.Preconditions; import com.android.server.AppStateTracker; import com.android.server.AppStateTracker.Listener; import com.android.server.LocalServices; @@ -32,6 +31,7 @@ import com.android.server.job.JobStore; import com.android.server.job.StateControllerProto; import com.android.server.job.StateControllerProto.BackgroundJobsController.TrackedJob; +import java.util.Objects; import java.util.function.Consumer; import java.util.function.Predicate; @@ -59,7 +59,7 @@ public final class BackgroundJobsController extends StateController { public BackgroundJobsController(JobSchedulerService service) { super(service); - mAppStateTracker = Preconditions.checkNotNull( + mAppStateTracker = Objects.requireNonNull( LocalServices.getService(AppStateTracker.class)); mAppStateTracker.addListener(mForceAppStandbyListener); } diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 3b6a00948463..f6aaa6f1a461 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -139,6 +139,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * Helper class used by TextView to handle editable text views. @@ -7062,11 +7063,11 @@ public class Editor { private final List<ResolveInfo> mSupportedActivities = new ArrayList<>(); private ProcessTextIntentActionsHandler(Editor editor) { - mEditor = Preconditions.checkNotNull(editor); - mTextView = Preconditions.checkNotNull(mEditor.mTextView); - mContext = Preconditions.checkNotNull(mTextView.getContext()); - mPackageManager = Preconditions.checkNotNull(mContext.getPackageManager()); - mPackageName = Preconditions.checkNotNull(mContext.getPackageName()); + mEditor = Objects.requireNonNull(editor); + mTextView = Objects.requireNonNull(mEditor.mTextView); + mContext = Objects.requireNonNull(mTextView.getContext()); + mPackageManager = Objects.requireNonNull(mContext.getPackageManager()); + mPackageName = Objects.requireNonNull(mContext.getPackageName()); } /** diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java index f58b6d192fde..2924dd9bf954 100644 --- a/core/java/android/widget/Magnifier.java +++ b/core/java/android/widget/Magnifier.java @@ -62,6 +62,7 @@ import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Objects; /** * Android magnifier widget. Can be used by any view which is attached to a window. @@ -1154,7 +1155,7 @@ public final class Magnifier { * @param view the view this magnifier is attached to */ public Builder(@NonNull View view) { - mView = Preconditions.checkNotNull(view); + mView = Objects.requireNonNull(view); applyDefaults(); } diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index d0f80936f477..4ef3f61b5280 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -87,7 +87,7 @@ public final class SelectionActionModeHelper { private final SmartSelectSprite mSmartSelectSprite; SelectionActionModeHelper(@NonNull Editor editor) { - mEditor = Preconditions.checkNotNull(editor); + mEditor = Objects.requireNonNull(editor); mTextView = mEditor.getTextView(); mTextClassificationHelper = new TextClassificationHelper( mTextView.getContext(), @@ -500,7 +500,7 @@ public final class SelectionActionModeHelper { private final LogAbandonRunnable mDelayedLogAbandon = new LogAbandonRunnable(); SelectionTracker(TextView textView) { - mTextView = Preconditions.checkNotNull(textView); + mTextView = Objects.requireNonNull(textView); mLogger = new SelectionMetricsLogger(textView); } @@ -703,7 +703,7 @@ public final class SelectionActionModeHelper { private String mText; SelectionMetricsLogger(TextView textView) { - Preconditions.checkNotNull(textView); + Objects.requireNonNull(textView); mEditTextLogger = textView.isTextEditable(); mTokenIterator = SelectionSessionLogger.getTokenIterator(textView.getTextLocale()); } @@ -714,7 +714,7 @@ public final class SelectionActionModeHelper { CharSequence text, int index, @InvocationMethod int invocationMethod) { try { - Preconditions.checkNotNull(text); + Objects.requireNonNull(text); Preconditions.checkArgumentInRange(index, 0, text.length(), "index"); if (mText == null || !mText.contentEquals(text)) { mText = text.toString(); @@ -972,11 +972,11 @@ public final class SelectionActionModeHelper { @NonNull Consumer<SelectionResult> selectionResultCallback, @NonNull Supplier<SelectionResult> timeOutResultSupplier) { super(textView != null ? textView.getHandler() : null); - mTextView = Preconditions.checkNotNull(textView); + mTextView = Objects.requireNonNull(textView); mTimeOutDuration = timeOut; - mSelectionResultSupplier = Preconditions.checkNotNull(selectionResultSupplier); - mSelectionResultCallback = Preconditions.checkNotNull(selectionResultCallback); - mTimeOutResultSupplier = Preconditions.checkNotNull(timeOutResultSupplier); + mSelectionResultSupplier = Objects.requireNonNull(selectionResultSupplier); + mSelectionResultCallback = Objects.requireNonNull(selectionResultCallback); + mTimeOutResultSupplier = Objects.requireNonNull(timeOutResultSupplier); // Make a copy of the original text. mOriginalText = getText(mTextView).toString(); } @@ -1051,14 +1051,14 @@ public final class SelectionActionModeHelper { TextClassificationHelper(Context context, Supplier<TextClassifier> textClassifier, CharSequence text, int selectionStart, int selectionEnd, LocaleList locales) { init(textClassifier, text, selectionStart, selectionEnd, locales); - mContext = Preconditions.checkNotNull(context); + mContext = Objects.requireNonNull(context); } @UiThread public void init(Supplier<TextClassifier> textClassifier, CharSequence text, int selectionStart, int selectionEnd, LocaleList locales) { - mTextClassifier = Preconditions.checkNotNull(textClassifier); - mText = Preconditions.checkNotNull(text).toString(); + mTextClassifier = Objects.requireNonNull(textClassifier); + mText = Objects.requireNonNull(text).toString(); mLastClassificationText = null; // invalidate. Preconditions.checkArgument(selectionEnd > selectionStart); mSelectionStart = selectionStart; diff --git a/core/java/android/widget/SmartSelectSprite.java b/core/java/android/widget/SmartSelectSprite.java index 9a84f69d120a..dc472e1bbd82 100644 --- a/core/java/android/widget/SmartSelectSprite.java +++ b/core/java/android/widget/SmartSelectSprite.java @@ -38,13 +38,12 @@ import android.text.Layout; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; -import com.android.internal.util.Preconditions; - import java.lang.annotation.Retention; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Objects; /** * A utility class for creating and animating the Smart Select animation. @@ -75,7 +74,7 @@ final class SmartSelectSprite { private final int mTextSelectionLayout; RectangleWithTextSelectionLayout(RectF rectangle, int textSelectionLayout) { - mRectangle = Preconditions.checkNotNull(rectangle); + mRectangle = Objects.requireNonNull(rectangle); mTextSelectionLayout = textSelectionLayout; } @@ -342,7 +341,7 @@ final class SmartSelectSprite { context, android.R.interpolator.fast_out_linear_in); mFillColor = highlightColor; - mInvalidator = Preconditions.checkNotNull(invalidator); + mInvalidator = Objects.requireNonNull(invalidator); } /** diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index eb1f5534fdef..00c0d302f48d 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1283,7 +1283,7 @@ <string name="heavy_weight_switcher_text" msgid="6814316627367160126">"للحصول على أداء أفضل، يمكن فتح لعبة واحدة فقط من هذه الألعاب في كل مرة."</string> <string name="old_app_action" msgid="725331621042848590">"الرجوع إلى <xliff:g id="OLD_APP">%1$s</xliff:g>"</string> <string name="new_app_action" msgid="547772182913269801">"فتح <xliff:g id="NEW_APP">%1$s</xliff:g>"</string> - <string name="new_app_description" msgid="1958903080400806644">"سيتم إغلاق <xliff:g id="OLD_APP">%1$s</xliff:g> من دون حفظ"</string> + <string name="new_app_description" msgid="1958903080400806644">"سيتم إغلاق <xliff:g id="OLD_APP">%1$s</xliff:g> بدون حفظ"</string> <string name="dump_heap_notification" msgid="5316644945404825032">"لقد تجاوزت <xliff:g id="PROC">%1$s</xliff:g> حد الذاكرة."</string> <string name="dump_heap_ready_notification" msgid="2302452262927390268">"نَسْخ الذاكرة <xliff:g id="PROC">%1$s</xliff:g> جاهز"</string> <string name="dump_heap_notification_detail" msgid="8431586843001054050">"تم جمع مقدار كبير من بيانات الذاكرة. انقر للمشاركة."</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index aa28bf2b9644..3e236798d657 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -665,7 +665,7 @@ <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"Sletter denne brukerens data på dette nettbrettet uten advarsel."</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2293713284515865200">"Tøm dataene til denne brukeren på denne Android TV-enheten uten advarsel."</string> <string name="policydesc_wipeData_secondaryUser" product="default" msgid="2788325512167208654">"Sletter denne brukerens data på denne telefonen uten advarsel."</string> - <string name="policylab_setGlobalProxy" msgid="215332221188670221">"Angi enhetens globale mellomtjener"</string> + <string name="policylab_setGlobalProxy" msgid="215332221188670221">"Angi enhetens globale proxy-tjener"</string> <string name="policydesc_setGlobalProxy" msgid="7149665222705519604">"Angir den globale proxy-tjeneren på enheten som skal brukes når regelen er aktivert. Bare eieren av enheten kan angi den globale proxy-tjeneren."</string> <string name="policylab_expirePassword" msgid="6015404400532459169">"Angi utløpstid for skjermlås"</string> <string name="policydesc_expirePassword" msgid="9136524319325960675">"Endrer hvor ofte PIN-koden, passordet eller mønsteret til skjermlåsen skal byttes."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index be173dd878e5..7aa91f7245ea 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -497,10 +497,8 @@ <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Aplikaciji omogoča ogled konfiguracije Bluetootha tabličnega računalnika ter vzpostavljanje in sprejemanje povezave s seznanjenimi napravami."</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Aplikaciji dovoljuje ogled konfiguracije vmesnika Bluetooth v napravi Android TV ter ustvarjanje in sprejemanje povezav s seznanjenimi napravami."</string> <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Aplikaciji omogoča ogled konfiguracije Bluetootha telefona ter ustvarjanje in sprejemanje povezave s seznanjenimi napravami."</string> - <!-- no translation found for permlab_preferredPaymentInfo (5274423844767445054) --> - <skip /> - <!-- no translation found for permdesc_preferredPaymentInfo (8583552469807294967) --> - <skip /> + <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Podatki o prednostni storitvi za plačevanje prek povezave NFC"</string> + <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Aplikaciji omogoča pridobivanje podatkov o prednostni storitvi za plačevanje prek povezave NFC, kot so registrirani pripomočki in cilj preusmeritve."</string> <string name="permlab_nfc" msgid="1904455246837674977">"nadzor nad komunikacijo s tehnologijo bližnjega polja"</string> <string name="permdesc_nfc" msgid="8352737680695296741">"Podpira komunikacijo med računalnikom in oznakami, karticami in bralniki komunikacije s tehnologijo bližnjega polja."</string> <string name="permlab_disableKeyguard" msgid="3605253559020928505">"onemogočanje zaklepanja zaslona"</string> @@ -1663,12 +1661,6 @@ <string name="accessibility_shortcut_enabling_service" msgid="6141620395915529473">"Bližnjica funkcij za ljudi s posebnimi potrebami je vklopila <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="1287340429965172651">"Bližnjica funkcij za ljudi s posebnimi potrebami je izklopila <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_spoken_feedback" msgid="4228997042855695090">"Za uporabo storitve <xliff:g id="SERVICE_NAME">%1$s</xliff:g> pritisnite obe tipki za glasnost in ju pridržite tri sekunde"</string> - <string name="accessibility_button_prompt_text" msgid="1634298854002673171">"Izberite storitev, ki jo želite uporabljati, ko se dotaknete gumba za funkcije za ljudi s posebnimi potrebami:"</string> - <string name="accessibility_gesture_prompt_text" msgid="3271927619707898924">"Izberite storitev, ki jo želite zagnati s potezo za ljudi s posebnimi potrebami (vlečenje z dvema prstoma z dna zaslona navzgor):"</string> - <string name="accessibility_gesture_3finger_prompt_text" msgid="218295923313037542">"Izberite storitev, ki jo želite zagnati s potezo za ljudi s posebnimi potrebami (vlečenje s tremi prsti z dna zaslona navzgor):"</string> - <string name="accessibility_button_instructional_text" msgid="8523635009916665153">"Če želite preklopiti med storitvami, pridržite gumb za funkcije za ljudi s posebnimi potrebami."</string> - <string name="accessibility_gesture_instructional_text" msgid="927882482331885974">"Če želite preklopiti med storitvami, z dvema prstoma povlecite navzgor in pridržite."</string> - <string name="accessibility_gesture_3finger_instructional_text" msgid="7527523742771203377">"Če želite preklopiti med storitvami, s tremi prsti povlecite navzgor in pridržite."</string> <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Povečava"</string> <string name="user_switched" msgid="7249833311585228097">"Trenutni uporabnik <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="1912993630661332336">"Preklop na uporabnika <xliff:g id="NAME">%1$s</xliff:g> …"</string> @@ -1927,11 +1919,9 @@ <string name="usb_mtp_launch_notification_title" msgid="774319638256707227">"Vzpostavljena povezava z napravo <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> <string name="usb_mtp_launch_notification_description" msgid="6942535713629852684">"Dotaknite se, če si želite ogledati datoteke"</string> <string name="pin_target" msgid="8036028973110156895">"Pripenjanje"</string> - <!-- no translation found for pin_specific_target (7824671240625957415) --> - <skip /> + <string name="pin_specific_target" msgid="7824671240625957415">"Pripni aplikacijo <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="unpin_target" msgid="3963318576590204447">"Odpenjanje"</string> - <!-- no translation found for unpin_specific_target (3859828252160908146) --> - <skip /> + <string name="unpin_specific_target" msgid="3859828252160908146">"Odpni aplikacijo <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="app_info" msgid="6113278084877079851">"Podatki o aplikacijah"</string> <string name="negative_duration" msgid="1938335096972945232">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="demo_starting_message" msgid="6577581216125805905">"Začenjanje predstavitve …"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index d01e8e787f47..2cc42d74f862 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -491,8 +491,8 @@ <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"允許應用程式查看平板電腦的藍牙設定，以及建立和接受與其他配對裝置的連線。"</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"允許應用程式查看 Android TV 裝置的藍牙設定，以及建立和接受與其他配對裝置的連線。"</string> <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"允許應用程式查看手機的藍牙設定，以及建立和接受與其他配對裝置的連線。"</string> - <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"首選 NFC 付款服務資訊"</string> - <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"允許應用程式取得首選 NFC 付款服務的資訊 (如已註冊的付款輔助和最終付款對象)。"</string> + <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"由用戶允許授權的 NFC 付款服務資訊"</string> + <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"允許應用程式取得由用戶允許授權的 NFC 付款服務資訊 (如已註冊的付款輔助功能和最終付款對象)。"</string> <string name="permlab_nfc" msgid="1904455246837674977">"控制近距離無線通訊"</string> <string name="permdesc_nfc" msgid="8352737680695296741">"允許應用程式使用近距離無線通訊 (NFC) 標記、卡片及讀取程式進行通訊。"</string> <string name="permlab_disableKeyguard" msgid="3605253559020928505">"停用螢幕上鎖"</string> diff --git a/packages/SettingsLib/res/values-ar/arrays.xml b/packages/SettingsLib/res/values-ar/arrays.xml index 7fc65a36e04a..b4f5253870c1 100644 --- a/packages/SettingsLib/res/values-ar/arrays.xml +++ b/packages/SettingsLib/res/values-ar/arrays.xml @@ -170,7 +170,7 @@ <string-array name="select_logpersist_titles"> <item msgid="704720725704372366">"إيقاف"</item> <item msgid="6014837961827347618">"الكل"</item> - <item msgid="7387060437894578132">"الكل دون اللاسلكي"</item> + <item msgid="7387060437894578132">"الكل بدون اللاسلكي"</item> <item msgid="7300881231043255746">"kernel فقط"</item> </string-array> <string-array name="select_logpersist_summaries"> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index d4e1b63c4ca5..43d2eceab51d 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -68,14 +68,14 @@ <string name="bluetooth_connecting" msgid="5871702668260192755">"جارٍ الاتصال…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"الجهاز متصل<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_pairing" msgid="4269046942588193600">"جارٍ الاقتران..."</string> - <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"الجهاز متصل (من دون هاتف)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"الجهاز متصل (من دون وسائط)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"الجهاز متصل (من دون وصول إلى الرسائل)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_connected_no_headset_no_a2dp" msgid="2893204819854215433">"الجهاز متصل (من دون هاتف أو وسائط)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"الجهاز متصل (بدون هاتف)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> + <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"الجهاز متصل (بدون وسائط)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> + <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"الجهاز متصل (بدون وصول إلى الرسائل)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset_no_a2dp" msgid="2893204819854215433">"الجهاز متصل (بدون هاتف أو وسائط)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_battery_level" msgid="5410325759372259950">"الجهاز متصل، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_headset_battery_level" msgid="2661863370509206428">"الجهاز متصل (من دون هاتف)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_a2dp_battery_level" msgid="6499078454894324287">"الجهاز متصل (من دون وسائط)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_headset_no_a2dp_battery_level" msgid="8477440576953067242">"الجهاز متّصل (من دون هاتف أو وسائط)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset_battery_level" msgid="2661863370509206428">"الجهاز متصل (بدون هاتف)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_a2dp_battery_level" msgid="6499078454894324287">"الجهاز متصل (بدون وسائط)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset_no_a2dp_battery_level" msgid="8477440576953067242">"الجهاز متّصل (بدون هاتف أو وسائط)، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> <string name="bluetooth_active_battery_level" msgid="3450745316700494425">"نشط، ومستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="bluetooth_active_battery_level_untethered" msgid="2706188607604205362">"مفعّلة، مستوى البطارية: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_0">%1$s</xliff:g>، المعدّل: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_1">%2$s</xliff:g>"</string> <string name="bluetooth_battery_level" msgid="2893696778200201555">"مستوى طاقة البطارية <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index 07d5ccbb840f..3f99d1044319 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -227,8 +227,7 @@ <string name="tethering_hardware_offload" msgid="4116053719006939161">"Konexioa partekatzeko hardwarearen azelerazioa"</string> <string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"Erakutsi Bluetooth gailuak izenik gabe"</string> <string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"Desgaitu bolumen absolutua"</string> - <!-- no translation found for bluetooth_enable_gabeldorsche (9131730396242883416) --> - <skip /> + <string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Gaitu Gabeldorsche"</string> <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"Bluetooth AVRCP bertsioa"</string> <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"Hautatu Bluetooth AVRCP bertsioa"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"Bluetooth bidezko audioaren kodeka"</string> @@ -277,8 +276,7 @@ <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"Egiaztatu ADB/ADT bidez instalatutako aplikazioak portaera kaltegarriak atzemateko"</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Bluetooth gailuak izenik gabe (MAC helbideak soilik) erakutsiko dira"</string> <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Bluetooth bidezko bolumen absolutuaren eginbidea desgaitu egiten du urruneko gailuetan arazoak hautematen badira; esaterako, bolumena ozenegia bada edo ezin bada kontrolatu"</string> - <!-- no translation found for bluetooth_enable_gabeldorsche_summary (8472344901097607030) --> - <skip /> + <string name="bluetooth_enable_gabeldorsche_summary" msgid="8472344901097607030">"Bluetooth Gabeldorsche eginbide sorta gaitzen du."</string> <string name="enable_terminal_title" msgid="3834790541986303654">"Tokiko terminala"</string> <string name="enable_terminal_summary" msgid="2481074834856064500">"Gaitu tokiko shell-sarbidea duen terminal-aplikazioa"</string> <string name="hdcp_checking_title" msgid="3155692785074095986">"HDCP egiaztapena"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 154f38604b26..f9ac3a539216 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -227,8 +227,7 @@ <string name="tethering_hardware_offload" msgid="4116053719006939161">"हार्डवेयर से तेज़ी लाने के लिए टेदर करें"</string> <string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"बिना नाम वाले ब्लूटूथ डिवाइस दिखाएं"</string> <string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"ब्लूटूथ से आवाज़ के नियंत्रण की सुविधा रोकें"</string> - <!-- no translation found for bluetooth_enable_gabeldorsche (9131730396242883416) --> - <skip /> + <string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Gabeldorsche चालू करें"</string> <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"ब्लूटूथ एवीआरसीपी वर्शन"</string> <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"ब्लूटूथ AVRCP वर्शन चुनें"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"ब्लूटूथ ऑडियो कोडेक"</string> @@ -277,8 +276,7 @@ <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"नुकसानदेह व्यवहार के लिए ADB/ADT से इंस्टॉल किए गए ऐप्लिकेशन जाँचें."</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"बिना नाम वाले ब्लूटूथ डिवाइस (केवल MAC पते वाले) दिखाए जाएंगे"</string> <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"दूर के डिवाइस पर आवाज़ बहुत बढ़ जाने या उससे नियंत्रण हटने जैसी समस्याएं होने पर, यह ब्लूटूथ के ज़रिए आवाज़ के नियंत्रण की सुविधा रोक देता है."</string> - <!-- no translation found for bluetooth_enable_gabeldorsche_summary (8472344901097607030) --> - <skip /> + <string name="bluetooth_enable_gabeldorsche_summary" msgid="8472344901097607030">"Bluetooth Gabeldorsche सुविधा का स्टैक चालू करें."</string> <string name="enable_terminal_title" msgid="3834790541986303654">"स्थानीय टर्मिनल"</string> <string name="enable_terminal_summary" msgid="2481074834856064500">"लोकल शेल तक पहुंचने की सुविधा देने वाले टर्मिनल ऐप को चालू करें"</string> <string name="hdcp_checking_title" msgid="3155692785074095986">"एचडीसीपी जाँच"</string> diff --git a/packages/SettingsLib/res/values-sl/arrays.xml b/packages/SettingsLib/res/values-sl/arrays.xml index 4c22bda7a79a..d946316af95d 100644 --- a/packages/SettingsLib/res/values-sl/arrays.xml +++ b/packages/SettingsLib/res/values-sl/arrays.xml @@ -82,8 +82,6 @@ <item msgid="1049450003868150455">"Zvok <xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g>"</item> <item msgid="2908219194098827570">"Zvok <xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_HD">aptX™ HD</xliff:g>"</item> <item msgid="3825367753087348007">"LDAC"</item> - <item msgid="5832677994279829983">"Omogoči izbirne kodeke"</item> - <item msgid="9205039209798344398">"Onemogoči izbirne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_summaries"> <item msgid="8868109554557331312">"Uporabi sistemsko izbiro (privzeto)"</item> @@ -92,8 +90,6 @@ <item msgid="8627333814413492563">"Zvok <xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g>"</item> <item msgid="3517061573669307965">"Zvok <xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_HD">aptX™ HD</xliff:g>"</item> <item msgid="2553206901068987657">"LDAC"</item> - <item msgid="221347164942544028">"Omogoči izbirne kodeke"</item> - <item msgid="7416462860415701287">"Onemogoči izbirne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_titles"> <item msgid="926809261293414607">"Uporabi sistemsko izbiro (privzeto)"</item> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 90d7829ae3bb..efd7c083eae4 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -227,6 +227,7 @@ <string name="tethering_hardware_offload" msgid="4116053719006939161">"Strojno pospeševanje za internetno povezavo prek mobilnega telefona"</string> <string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"Prikaži naprave Bluetooth brez imen"</string> <string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"Onemogočanje absolutne glasnosti"</string> + <string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Omogoči Gabeldorsche"</string> <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"Različica profila AVRCP za Bluetooth"</string> <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"Izberite različico profila AVRCP za Bluetooth"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"Zvočni kodek za Bluetooth"</string> @@ -275,6 +276,7 @@ <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"Preveri, ali so aplikacije, nameščene prek ADB/ADT, škodljive."</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Prikazane bodo naprave Bluetooth brez imen (samo z naslovi MAC)"</string> <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Onemogoči funkcijo absolutne glasnosti za Bluetooth, če pride do težav z glasnostjo z oddaljenimi napravami, kot je nesprejemljivo visoka glasnost ali pomanjkanje nadzora."</string> + <string name="bluetooth_enable_gabeldorsche_summary" msgid="8472344901097607030">"Omogoči sklad funkcij Bluetooth Gabeldorche."</string> <string name="enable_terminal_title" msgid="3834790541986303654">"Lokalni terminal"</string> <string name="enable_terminal_summary" msgid="2481074834856064500">"Omogočanje terminalske aplikacije za dostop do lokalne lupine"</string> <string name="hdcp_checking_title" msgid="3155692785074095986">"Preverjanje HDCP"</string> @@ -379,7 +381,7 @@ <string name="daltonizer_mode_protanomaly" msgid="7805583306666608440">"Protanomalija (rdeča – zelena)"</string> <string name="daltonizer_mode_tritanomaly" msgid="7135266249220732267">"Tritanomalija (modra – rumena)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="1810693571332381974">"Popravljanje barv"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="5190814747212060815">"To je preskusna funkcija in lahko vpliva na učinkovitost delovanja."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="9137381746633858694">"Popravljanje barv osebam z barvno slepoto pomaga, da vidijo bolj prave barve"</string> <string name="daltonizer_type_overridden" msgid="4509604753672535721">"Preglasila nastavitev: <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_settings_home_page" msgid="4885165789445462557">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> – <xliff:g id="TIME_STRING">%2$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="8264199158671531431">"Še približno <xliff:g id="TIME_REMAINING">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java index 995b35f2b5b3..fdeaf1f016c3 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java @@ -134,7 +134,8 @@ class BubbleTouchHandler implements View.OnTouchListener { if (isStack) { mViewPositionOnTouchDown.set(mStack.getStackPosition()); mStack.onDragStart(); - if (!mStack.isShowingBubbleMenu() && !mStack.isExpanded()) { + if (!mStack.isShowingBubbleMenu() && !mStack.isExpanded() + && BubbleExperimentConfig.allowBubbleScreenshotMenu(mContext)) { mShowBubbleMenuRunnable = mStack::showBubbleMenu; mStack.postDelayed(mShowBubbleMenuRunnable, ViewConfiguration.getLongPressTimeout()); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java index 778443c4bddf..fdb793e6da95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java @@ -33,6 +33,7 @@ import com.android.systemui.statusbar.policy.RemoteInputView; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * Keeps track of the currently active {@link RemoteInputView}s. @@ -108,8 +109,8 @@ public class RemoteInputController { * @param token a token identifying the view that is managing the remote input */ public void addRemoteInput(NotificationEntry entry, Object token) { - Preconditions.checkNotNull(entry); - Preconditions.checkNotNull(token); + Objects.requireNonNull(entry); + Objects.requireNonNull(token); boolean found = pruneWeakThenRemoveAndContains( entry /* contains */, null /* remove */, token /* removeToken */); @@ -129,7 +130,7 @@ public class RemoteInputController { * entry. If null, the entry is removed regardless. */ public void removeRemoteInput(NotificationEntry entry, Object token) { - Preconditions.checkNotNull(entry); + Objects.requireNonNull(entry); pruneWeakThenRemoveAndContains(null /* contains */, entry /* remove */, token); @@ -143,8 +144,8 @@ public class RemoteInputController { * @param token the token of the view managing the remote input. */ public void addSpinning(String key, Object token) { - Preconditions.checkNotNull(key); - Preconditions.checkNotNull(token); + Objects.requireNonNull(key); + Objects.requireNonNull(token); mSpinning.put(key, token); } @@ -158,7 +159,7 @@ public class RemoteInputController { * entry. If null, the entry is removed regardless. */ public void removeSpinning(String key, Object token) { - Preconditions.checkNotNull(key); + Objects.requireNonNull(key); if (token == null || mSpinning.get(key) == token) { mSpinning.remove(key); @@ -237,7 +238,7 @@ public class RemoteInputController { public void addCallback(Callback callback) { - Preconditions.checkNotNull(callback); + Objects.requireNonNull(callback); mCallbacks.add(callback); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java index 7b1dc074fcbc..f2765db6fd46 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java @@ -16,14 +16,14 @@ package com.android.systemui.statusbar.notification; -import static com.android.internal.util.Preconditions.checkNotNull; - import com.android.internal.statusbar.NotificationVisibility; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; +import java.util.Objects; + /** * Root controller for the list of notifications in the shade. * @@ -39,9 +39,9 @@ public class NotificationListController { NotificationEntryManager entryManager, NotificationListContainer listContainer, DeviceProvisionedController deviceProvisionedController) { - mEntryManager = checkNotNull(entryManager); - mListContainer = checkNotNull(listContainer); - mDeviceProvisionedController = checkNotNull(deviceProvisionedController); + mEntryManager = Objects.requireNonNull(entryManager); + mListContainer = Objects.requireNonNull(listContainer); + mDeviceProvisionedController = Objects.requireNonNull(deviceProvisionedController); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index 7f85c88865f6..7df7568875de 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -35,8 +35,6 @@ import static android.service.notification.NotificationListenerService.REASON_TI import static android.service.notification.NotificationListenerService.REASON_UNAUTOBUNDLED; import static android.service.notification.NotificationListenerService.REASON_USER_STOPPED; -import static com.android.internal.util.Preconditions.checkNotNull; - import android.annotation.IntDef; import android.annotation.MainThread; import android.annotation.NonNull; @@ -60,6 +58,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; @@ -170,7 +169,7 @@ public class NotifCollection { @CancellationReason int reason, @NonNull DismissedByUserStats stats) { Assert.isMainThread(); - checkNotNull(stats); + Objects.requireNonNull(stats); checkForReentrantCall(); removeNotification(entry.getKey(), null, reason, stats); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index dd3a3e0b1505..4f4fb240162d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -29,7 +29,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICAT import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING; import android.annotation.NonNull; @@ -162,9 +161,9 @@ public final class NotificationEntry extends ListEntry { public NotificationEntry( @NonNull StatusBarNotification sbn, @NonNull Ranking ranking) { - super(checkNotNull(checkNotNull(sbn).getKey())); + super(Objects.requireNonNull(Objects.requireNonNull(sbn).getKey())); - checkNotNull(ranking); + Objects.requireNonNull(ranking); mKey = sbn.getKey(); setSbn(sbn); @@ -194,8 +193,8 @@ public final class NotificationEntry extends ListEntry { * TODO: Make this package-private */ public void setSbn(@NonNull StatusBarNotification sbn) { - checkNotNull(sbn); - checkNotNull(sbn.getKey()); + Objects.requireNonNull(sbn); + Objects.requireNonNull(sbn.getKey()); if (!sbn.getKey().equals(mKey)) { throw new IllegalArgumentException("New key " + sbn.getKey() @@ -223,8 +222,8 @@ public final class NotificationEntry extends ListEntry { * TODO: Make this package-private */ public void setRanking(@NonNull Ranking ranking) { - checkNotNull(ranking); - checkNotNull(ranking.getKey()); + Objects.requireNonNull(ranking); + Objects.requireNonNull(ranking.getKey()); if (!ranking.getKey().equals(mKey)) { throw new IllegalArgumentException("New key " + ranking.getKey() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java index 8afbc27589d8..6c93618e5395 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.notification.collection; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENABLE_REMOTE_INPUT; import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP; @@ -51,6 +50,8 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.policy.HeadsUpManager; +import java.util.Objects; + /** Handles inflating and updating views for notifications. */ public class NotificationRowBinderImpl implements NotificationRowBinder { @@ -265,7 +266,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { row.inflateViews(); // bind the click event to the content area - checkNotNull(mNotificationClicker).register(row, sbn); + Objects.requireNonNull(mNotificationClicker).register(row, sbn); } private void logNotificationExpansion(String key, boolean userAction, boolean expanded) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java index b444fa50a253..add982dabf02 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java @@ -16,8 +16,6 @@ package com.android.systemui.statusbar.notification.stack; -import static com.android.internal.util.Preconditions.checkNotNull; - import android.annotation.Nullable; import android.content.Context; import android.graphics.RectF; @@ -32,6 +30,8 @@ import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; +import java.util.Objects; + /** * Similar in size and appearance to the NotificationShelf, appears at the beginning of some * notification sections. Currently only used for gentle notifications. @@ -51,13 +51,13 @@ public class SectionHeaderView extends ActivatableNotificationView { @Override protected void onFinishInflate() { super.onFinishInflate(); - mContents = checkNotNull(findViewById(R.id.content)); + mContents = Objects.requireNonNull(findViewById(R.id.content)); bindContents(); } private void bindContents() { - mLabelView = checkNotNull(findViewById(R.id.header_label)); - mClearAllButton = checkNotNull(findViewById(R.id.btn_clear_all)); + mLabelView = Objects.requireNonNull(findViewById(R.id.header_label)); + mClearAllButton = Objects.requireNonNull(findViewById(R.id.btn_clear_all)); if (mOnClearClickListener != null) { mClearAllButton.setOnClickListener(mOnClearClickListener); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java index b1986782e914..88edf8e40972 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java @@ -23,11 +23,11 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; -import com.android.internal.util.Preconditions; import com.android.systemui.R; import com.android.systemui.statusbar.phone.NotificationPanelView; import com.android.systemui.statusbar.phone.StatusBarWindowView; +import java.util.Objects; import java.util.function.Consumer; /** @@ -117,7 +117,7 @@ public class BrightnessMirrorController @Override public void addCallback(BrightnessMirrorListener listener) { - Preconditions.checkNotNull(listener); + Objects.requireNonNull(listener); mBrightnessMirrorListeners.add(listener); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index 1cb2bd430199..0ab08a8fd168 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -27,7 +27,6 @@ import android.os.Trace; import androidx.annotation.VisibleForTesting; -import com.android.internal.util.Preconditions; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; @@ -36,6 +35,7 @@ import com.android.systemui.Dumpable; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; @@ -98,7 +98,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum @Override public void addCallback(@NonNull Callback callback) { - Preconditions.checkNotNull(callback, "Callback must not be null. b/128895449"); + Objects.requireNonNull(callback, "Callback must not be null. b/128895449"); if (!mCallbacks.contains(callback)) { mCallbacks.add(callback); } @@ -106,7 +106,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum @Override public void removeCallback(@NonNull Callback callback) { - Preconditions.checkNotNull(callback, "Callback must not be null. b/128895449"); + Objects.requireNonNull(callback, "Callback must not be null. b/128895449"); mCallbacks.remove(callback); } 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 a7972878171a..37da236c2227 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/SettableWakeLock.java @@ -16,7 +16,7 @@ package com.android.systemui.util.wakelock; -import com.android.internal.util.Preconditions; +import java.util.Objects; public class SettableWakeLock { @@ -26,7 +26,7 @@ public class SettableWakeLock { private boolean mAcquired; public SettableWakeLock(WakeLock inner, String why) { - Preconditions.checkNotNull(inner, "inner wakelock required"); + Objects.requireNonNull(inner, "inner wakelock required"); mInner = inner; mWhy = why; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java index 0dcd25300633..e1e7220f1a5f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.notification.collection; import static android.service.notification.NotificationListenerService.REASON_APP_CANCEL; import static android.service.notification.NotificationListenerService.REASON_CLICK; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_UNKNOWN; import static org.junit.Assert.assertEquals; @@ -65,6 +64,7 @@ import org.mockito.Spy; import java.util.Arrays; import java.util.Map; +import java.util.Objects; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -99,7 +99,7 @@ public class NotifCollectionTest extends SysuiTestCase { // Capture the listener object that the collection registers with the listener service so // we can simulate listener service events in tests below verify(mListenerService).addNotificationListener(mListenerCaptor.capture()); - mServiceListener = checkNotNull(mListenerCaptor.getValue()); + mServiceListener = Objects.requireNonNull(mListenerCaptor.getValue()); mNoMan = new NoManSimulator(mServiceListener); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java index 6e9c2c8adb4a..a8f3638dff32 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.notification.collection; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.systemui.statusbar.notification.collection.ListDumper.dumpList; import static org.junit.Assert.assertEquals; @@ -67,6 +66,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @SmallTest @@ -105,7 +105,7 @@ public class NotifListBuilderImplTest extends SysuiTestCase { mListBuilder.attach(mNotifCollection); Mockito.verify(mNotifCollection).setBuildListener(mBuildListenerCaptor.capture()); - mReadyForBuildListener = checkNotNull(mBuildListenerCaptor.getValue()); + mReadyForBuildListener = Objects.requireNonNull(mBuildListenerCaptor.getValue()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java index a02445487dc0..3d59d6162c0c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java @@ -18,8 +18,6 @@ package com.android.systemui.statusbar.phone; import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS; -import static com.android.internal.util.Preconditions.checkNotNull; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -50,6 +48,8 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Objects; + @SmallTest @RunWith(AndroidTestingRunner.class) @RunWithLooper @@ -85,11 +85,11 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { // Capture the entry listener object so we can simulate events in tests below verify(mEntryManager).addNotificationEntryListener(mListenerCaptor.capture()); - mEntryListener = checkNotNull(mListenerCaptor.getValue()); + mEntryListener = Objects.requireNonNull(mListenerCaptor.getValue()); // Capture the callback object so we can simulate callback events in tests below verify(mCommandQueue).addCallback(mCallbacksCaptor.capture()); - mCallbacks = checkNotNull(mCallbacksCaptor.getValue()); + mCallbacks = Objects.requireNonNull(mCallbacksCaptor.getValue()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java b/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java index e15ca1da928d..27b225e3c4fa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java @@ -30,14 +30,13 @@ import android.os.MemoryFile; import android.os.SystemClock; import android.util.ArraySet; -import com.android.internal.util.Preconditions; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -113,7 +112,7 @@ public class FakeSensorManager extends SensorManager { @Override protected void unregisterListenerImpl(SensorEventListener listener, Sensor sensor) { - Preconditions.checkNotNull(listener); + Objects.requireNonNull(listener); for (FakeGenericSensor s : mSensors) { if (sensor == null || s.mSensor == sensor) { s.mListeners.remove(listener); @@ -125,8 +124,8 @@ public class FakeSensorManager extends SensorManager { protected boolean registerListenerImpl(SensorEventListener listener, Sensor sensor, int delayUs, Handler handler, int maxReportLatencyUs, int reservedFlags) { - Preconditions.checkNotNull(sensor); - Preconditions.checkNotNull(listener); + Objects.requireNonNull(sensor); + Objects.requireNonNull(listener); for (FakeGenericSensor s : mSensors) { if (s.mSensor == sensor) { s.mListeners.add(listener); diff --git a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java index 080e6cea8333..a9e8719890ef 100755 --- a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java +++ b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java @@ -26,6 +26,7 @@ import com.android.server.hdmi.HdmiControlService.DevicePollingCallback; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * Feature action that handles device discovery sequences. @@ -106,7 +107,7 @@ final class DeviceDiscoveryAction extends HdmiCecFeatureAction { */ DeviceDiscoveryAction(HdmiCecLocalDevice source, DeviceDiscoveryCallback callback, int delay) { super(source); - mCallback = Preconditions.checkNotNull(callback); + mCallback = Objects.requireNonNull(callback); mDelayPeriod = delay; } diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index bcc4c1fd902c..6c65c3680dae 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -151,6 +151,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -1594,8 +1595,8 @@ public class LockSettingsService extends ILockSettings.Stub { */ private boolean setLockCredentialInternal(LockscreenCredential credential, LockscreenCredential savedCredential, int userId, boolean isLockTiedToParent) { - Preconditions.checkNotNull(credential); - Preconditions.checkNotNull(savedCredential); + Objects.requireNonNull(credential); + Objects.requireNonNull(savedCredential); synchronized (mSpManager) { if (isSyntheticPasswordBasedCredentialLocked(userId)) { return spBasedSetLockCredentialInternalLocked(credential, savedCredential, userId, diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java index c53647d053bc..0fe16be2188e 100644 --- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java +++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java @@ -57,6 +57,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Set; @@ -228,8 +229,8 @@ public class SyntheticPasswordManager { * by {@link #setEscrowData} before calling this. */ public void recreateFromEscrow(byte[] escrowSplit0) { - Preconditions.checkNotNull(mEscrowSplit1); - Preconditions.checkNotNull(mEncryptedEscrowSplit0); + Objects.requireNonNull(mEscrowSplit1); + Objects.requireNonNull(mEncryptedEscrowSplit0); recreate(escrowSplit0, mEscrowSplit1); } diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java index 1b14ce21bb92..383d5cf326c0 100644 --- a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java +++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java @@ -75,6 +75,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -302,8 +303,8 @@ public class RecoverableKeyStoreManager { checkRecoverKeyStorePermission(); rootCertificateAlias = mTestCertHelper.getDefaultCertificateAliasIfEmpty(rootCertificateAlias); - Preconditions.checkNotNull(recoveryServiceCertFile, "recoveryServiceCertFile is null"); - Preconditions.checkNotNull(recoveryServiceSigFile, "recoveryServiceSigFile is null"); + Objects.requireNonNull(recoveryServiceCertFile, "recoveryServiceCertFile is null"); + Objects.requireNonNull(recoveryServiceSigFile, "recoveryServiceSigFile is null"); SigXml sigXml; try { @@ -393,7 +394,7 @@ public class RecoverableKeyStoreManager { */ public void setRecoveryStatus(@NonNull String alias, int status) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(alias, "alias is null"); + Objects.requireNonNull(alias, "alias is null"); long updatedRows = mDatabase.setRecoveryStatus(Binder.getCallingUid(), alias, status); if (updatedRows < 0) { throw new ServiceSpecificException( @@ -424,7 +425,7 @@ public class RecoverableKeyStoreManager { @NonNull @KeyChainProtectionParams.UserSecretType int[] secretTypes) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(secretTypes, "secretTypes is null"); + Objects.requireNonNull(secretTypes, "secretTypes is null"); int userId = UserHandle.getCallingUserId(); int uid = Binder.getCallingUid(); @@ -556,11 +557,11 @@ public class RecoverableKeyStoreManager { checkRecoverKeyStorePermission(); rootCertificateAlias = mTestCertHelper.getDefaultCertificateAliasIfEmpty(rootCertificateAlias); - Preconditions.checkNotNull(sessionId, "invalid session"); - Preconditions.checkNotNull(verifierCertPath, "verifierCertPath is null"); - Preconditions.checkNotNull(vaultParams, "vaultParams is null"); - Preconditions.checkNotNull(vaultChallenge, "vaultChallenge is null"); - Preconditions.checkNotNull(secrets, "secrets is null"); + Objects.requireNonNull(sessionId, "invalid session"); + Objects.requireNonNull(verifierCertPath, "verifierCertPath is null"); + Objects.requireNonNull(vaultParams, "vaultParams is null"); + Objects.requireNonNull(vaultChallenge, "vaultChallenge is null"); + Objects.requireNonNull(secrets, "secrets is null"); CertPath certPath; try { certPath = verifierCertPath.getCertPath(); @@ -666,13 +667,13 @@ public class RecoverableKeyStoreManager { */ public void closeSession(@NonNull String sessionId) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(sessionId, "invalid session"); + Objects.requireNonNull(sessionId, "invalid session"); mRecoverySessionStorage.remove(Binder.getCallingUid(), sessionId); } public void removeKey(@NonNull String alias) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(alias, "alias is null"); + Objects.requireNonNull(alias, "alias is null"); int uid = Binder.getCallingUid(); int userId = UserHandle.getCallingUserId(); @@ -711,7 +712,7 @@ public class RecoverableKeyStoreManager { public String generateKeyWithMetadata(@NonNull String alias, @Nullable byte[] metadata) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(alias, "alias is null"); + Objects.requireNonNull(alias, "alias is null"); int uid = Binder.getCallingUid(); int userId = UserHandle.getCallingUserId(); @@ -771,8 +772,8 @@ public class RecoverableKeyStoreManager { public @Nullable String importKeyWithMetadata(@NonNull String alias, @NonNull byte[] keyBytes, @Nullable byte[] metadata) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(alias, "alias is null"); - Preconditions.checkNotNull(keyBytes, "keyBytes is null"); + Objects.requireNonNull(alias, "alias is null"); + Objects.requireNonNull(keyBytes, "keyBytes is null"); if (keyBytes.length != RecoverableKeyGenerator.KEY_SIZE_BITS / Byte.SIZE) { Log.e(TAG, "The given key for import doesn't have the required length " + RecoverableKeyGenerator.KEY_SIZE_BITS); @@ -816,7 +817,7 @@ public class RecoverableKeyStoreManager { */ public @Nullable String getKey(@NonNull String alias) throws RemoteException { checkRecoverKeyStorePermission(); - Preconditions.checkNotNull(alias, "alias is null"); + Objects.requireNonNull(alias, "alias is null"); int uid = Binder.getCallingUid(); int userId = UserHandle.getCallingUserId(); return getAlias(userId, uid, alias); diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java index f0e462503769..4142e6ff4d69 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java @@ -49,6 +49,7 @@ import com.android.server.power.batterysaver.BatterySavingStats.DozeState; import com.android.server.power.batterysaver.BatterySavingStats.InteractiveState; import java.util.ArrayList; +import java.util.Objects; /** * Responsible for battery saver mode transition logic. @@ -237,7 +238,7 @@ public class BatterySaverController implements BatterySaverPolicyListener { private PowerManager getPowerManager() { if (mPowerManager == null) { mPowerManager = - Preconditions.checkNotNull(mContext.getSystemService(PowerManager.class)); + Objects.requireNonNull(mContext.getSystemService(PowerManager.class)); } return mPowerManager; } diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index ac1dbc4b755a..6c3b58018392 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -296,6 +296,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -6164,7 +6165,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final class LocalService extends ActivityTaskManagerInternal { @Override public SleepToken acquireSleepToken(String tag, int displayId) { - Preconditions.checkNotNull(tag); + Objects.requireNonNull(tag); return ActivityTaskManagerService.this.acquireSleepToken(tag, displayId); } @@ -6221,7 +6222,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public int startActivitiesAsPackage(String packageName, int userId, Intent[] intents, Bundle bOptions) { - Preconditions.checkNotNull(intents, "intents"); + Objects.requireNonNull(intents, "intents"); final String[] resolvedTypes = new String[intents.length]; // UID of the package on user userId. diff --git a/services/core/java/com/android/server/wm/DragDropController.java b/services/core/java/com/android/server/wm/DragDropController.java index d5f403f85621..999aab982816 100644 --- a/services/core/java/com/android/server/wm/DragDropController.java +++ b/services/core/java/com/android/server/wm/DragDropController.java @@ -37,6 +37,7 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.server.wm.WindowManagerInternal.IDragDropCallback; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; /** @@ -74,7 +75,7 @@ class DragDropController { } void registerCallback(IDragDropCallback callback) { - Preconditions.checkNotNull(callback); + Objects.requireNonNull(callback); mCallback.set(callback); } diff --git a/services/core/java/com/android/server/wm/WindowManagerConstants.java b/services/core/java/com/android/server/wm/WindowManagerConstants.java index 74d5c049746d..b0c5dbc6cca3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerConstants.java +++ b/services/core/java/com/android/server/wm/WindowManagerConstants.java @@ -19,8 +19,6 @@ package com.android.server.wm; import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE; import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP; -import static com.android.internal.util.Preconditions.checkNotNull; - import android.provider.AndroidDeviceConfig; import android.provider.DeviceConfig; @@ -28,6 +26,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.server.wm.utils.DeviceConfigInterface; import java.io.PrintWriter; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -74,8 +73,8 @@ final class WindowManagerConstants { WindowManagerConstants(WindowManagerGlobalLock globalLock, Runnable updateSystemGestureExclusionCallback, DeviceConfigInterface deviceConfig) { - mGlobalLock = checkNotNull(globalLock); - mUpdateSystemGestureExclusionCallback = checkNotNull(updateSystemGestureExclusionCallback); + mGlobalLock = Objects.requireNonNull(globalLock); + mUpdateSystemGestureExclusionCallback = Objects.requireNonNull(updateSystemGestureExclusionCallback); mDeviceConfig = deviceConfig; mListenerAndroid = this::onAndroidPropertiesChanged; mListenerWindowManager = this::onWindowPropertiesChanged; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 53c5ebde05bf..9c554d997068 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -296,6 +296,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.function.Supplier; @@ -2864,7 +2865,7 @@ public class WindowManagerService extends IWindowManager.Stub != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires DISABLE_KEYGUARD permission"); } - Preconditions.checkNotNull(token, "token is null"); + Objects.requireNonNull(token, "token is null"); final int callingUid = Binder.getCallingUid(); final long origIdentity = Binder.clearCallingIdentity(); try { |