summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-13[master] Wait for BOOT_COMPLETE event before scheduling the bootDexoptJoblineage-18.1Calin Juravle
Also, clean up logging and transition to Slog. Test: manual Bug: 179094324 Change-Id: I87740397b6f8fc85faf4bbb2222434f90ebad554
2021-10-13[master] BackgroundDexOptService: defer post-boot job furtherTim Murray
Delay the post-boot dexopt job to avoid mmap_sem contention caused by mapping dex files. Test: boot, dexopt starts later Bug: 161866124 (cherry pick from commit 097788086569bc464ee888f959d1413fa38e862b) Merged-In: Iaceb2b7c34c7b923778a8a603d7b9666ea9a20c4 Change-Id: Iaceb2b7c34c7b923778a8a603d7b9666ea9a20c4
2021-10-13[master] Enforce system/root/shell for dexopt operation.Calin Juravle
Dexopt acquires system level locks (e.g. installd locks) so it should not be called by artbitrary apps via `adb shell` commands. Test: manual Bug: 180652564 Change-Id: I385d5346df7721d95edf40c45d06b969870e4bda
2021-10-12Merge remote-tracking branch 'upstream/lineage-18.1' into lineage-18.1alk3pInjection
* upstream/lineage-18.1: [1/2] Add battery info to tvsettings device info (-) SystemUI: fix volume dialog position on TV Make sure that only the owner can call stopVpnProfile() DO NOT MERGE Apply a maximum char count to the load label api Send targeted broadcasts to prevent other apps from receiving them. Guard DISABLE_PLUGIN with PLUGIN permission. Fix a potential thread safety issue in VectorDrawable Fix background bypass via notifications Change ownership of the account request notification. Conflicts: packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java Change-Id: Ic64698088ee30b059623adf0f262d4f33a4e40df
2021-10-05Merge tag 'android-11.0.0_r46' into ↵Kevin F. Haggerty
staging/lineage-18.1_merge-android-11.0.0_r46 Android 11.0.0 Release 46 (RQ3A.211001.001) * tag 'android-11.0.0_r46': Make sure that only the owner can call stopVpnProfile() DO NOT MERGE Apply a maximum char count to the load label api Send targeted broadcasts to prevent other apps from receiving them. Guard DISABLE_PLUGIN with PLUGIN permission. Fix a potential thread safety issue in VectorDrawable Fix background bypass via notifications Change ownership of the account request notification. Change-Id: I30615811a1c2ee4d670c643d892d1a9f275e2a9c
2021-09-29[1/2] Add battery info to tvsettings device infoAaron Kling
Change-Id: I98abe338d77b56f2a851e0f093a44d6911b9009b (cherry picked from commit 5cd43b356ebfe1b4018fbf9fbe5dd551e9a82b78) (cherry picked from commit cceffef44a297cafc671590fb541f5c5171d6ee6)
2021-09-29SystemUI: fix volume dialog position on TVTimi Rautamäki
Expanded volume panel didn't respect the TV dimensions. Bring them back conditionally. Change-Id: I1d0c884726b74cc38fb825aebdff2484285789c2
2021-09-27LockPatternView: Fix a11y+BiometricPrompt related OOB exceptionLuK1337
Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/4007 Change-Id: Ifcae0a46430915c93b9e65ad968ca7e90504a9fb
2021-09-27[ArrowOS][11.0] base: Allow using face as auth method for apps [1/2]jhenrique09
commit 60756fa71bf50986b44b8cceea81f515a9df088f (HEAD) Author: jhenrique09 <jhenrique09.mcz@hotmail.com> Date: Sun Mar 7 17:16:03 2021 -0300 fixup - [1/2] Allow using face as auth method for apps Change-Id: If9fd734b93fc2a507d41984d1997ddbabf26f3ec Change-Id: I008370cefe9584c86e058b718e2ef79518b95eb6
2021-09-27[ArrowOS][11.0] SystemUI: Face Unlock animationDil3mm4
Change-Id: I3b6addb91923ca703f9e73bfce9bcf0bf8f1fc85
2021-09-27[ArrowOS][11.0] FaceService: Nuke useless call to getAuthenticatorIdjhenrique09
That value is static, so the call isn't needed. That fixes also a logspam: 2021-03-06 21:11:09.553 1767-1767/? W/Binder: Outgoing transactions from this process must be FLAG_ONEWAY java.lang.Throwable at android.os.BinderProxy.transact(BinderProxy.java:511) at com.android.internal.util.custom.faceunlock.IFaceService$Stub$Proxy.getAuthenticatorId(IFaceService.java:335) at com.android.server.biometrics.face.CustomFaceService.getAuthenticatorId(CustomFaceService.java:275) at com.android.server.biometrics.face.FaceService.updateActiveGroup(FaceService.java:1190) at com.android.server.biometrics.BiometricServiceBase.loadAuthenticatorIds(BiometricServiceBase.java:1183) at com.android.server.biometrics.face.CustomFaceService$FaceServiceConnection.lambda$onServiceConnected$0$CustomFaceService$FaceServiceConnection(CustomFaceService.java:427) at com.android.server.biometrics.face.-$$Lambda$CustomFaceService$FaceServiceConnection$xfTT3adGf0joHpCrnXRrbjd4jD8.run(Unknown Source:2) at android.os.Handler.handleCallback(Handler.java:938) at android.os.Handler.dispatchMessage(Handler.java:99) at android.os.Looper.loop(Looper.java:223) at com.android.server.SystemServer.run(SystemServer.java:631) at com.android.server.SystemServer.main(SystemServer.java:417) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:925) Change-Id: I98d5f4bad9af7faaea8d5333362d080f41a16c85
2021-09-27[ArrowOS][11.0] Add isFaceAuthEnabledForUser checks in KeyguardLiftControllerjie shen
When request pick gesture sensor, judge that if the current user does not turn on the face unlocking function, the sensor should not be Listening Fixes: 161954958 Test: presubmit Change-Id: I34552315049e07f123403fe693251edb460fef5d
2021-09-27[ArrowOS][11.0] LockIcon: Don't cache icon when scanning facejhenrique09
Change-Id: I739773e8ac717b782ea8d1f93c3c0bc137d7efa5
2021-09-27[ArrowOS][11.0] SystemUI: Allow listening for face only on pin/pass viewjhenrique09
Useful for devices with popup camera Include: commit 147c2654ad60b3582b5e433759c4fedc9d470cf6 (HEAD) Author: jhenrique09 <jhenrique09.mcz@hotmail.com> Date: Fri Mar 5 20:54:21 2021 -0300 cleanup - SystemUI: Allow listening for face only on pin/pass view Change-Id: I04fe60e46e54bdead8b6f0dd432604bbaf711b1b Change-Id: Ifba770dd1681858844d5d0290cbf385bfa47f841
2021-09-27[ArrowOS][11.0] base: do not use new lockscreen layout for bypassEthan Halsall
- bypassEnabled will always evaluate to false now. - Introduce bypassEnabledBiometric which is only used to tell the biometric service whether we can bypass lockscreen without swipe dependant on Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD. Signed-off-by: Ethan Halsall <ethan.halsall@gmail.com> Change-Id: Ibdbf16df18543382219a75ce1aaf4e25f3fb4ddb
2021-09-27[ArrowOS][11.0] fwb: Guard some functions against face unlockjhenrique09
Change-Id: I26d6f6d9ead884aff361236d2e5aa202d90704ba
2021-09-27[ArrowOS][11.0] base: Port face unlock featurejhenrique09
From motorola/nio_retcn/nio:11/RRN31.Q1-20-17-1/1cbc0:user/release-keys Change-Id: I493fb57047ae7b9fe7ce775667207b60889070ba
2021-09-27[ArrowOS][11.0] AuthContainerView: Fix rare SystemUI crashSimão Gomes Viana
This can happen if the fingerprint is validated twice in a row before the view has time to disappear. Make the method synchronized to avoid race conditions of any kind and add an additional try-catch as a safeguard. Change-Id: Ic2b76be1cc0f5217351e39ec24159ca23043ab4f
2021-09-27[crdroid][11.0] KeyguardClockSwitch: Fix missing status view on custom clocksPranav Vashi
To replicate: * Switch to Typographic clock * Check keyguard status view is disabled * Switch back to custom clock (like bold version) * Keyguard status view remains disabled Expectation: * Keyguard status view should be visible This patch fixes issue. Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: If61977cdaebc4852cead9bd3fadf5a2f095c42cc
2021-09-27TypeClock: ShapeShift: Fix thumbnailalk3pInjection
Change-Id: Id864332dee7f739266af99c1b91914e26434d195
2021-09-27[crdroid][11.0] TypeClock: Introduce ShapeShift lockscreen clockmezz
Very very very heavily inspired by OOS. pretty much OOS. it's OOS. MezzLasha: Fix ShapeShift clock on 24h format neobuddy89: Fix up preview for ShapeShift clock Change-Id: I3767b3913956f394ac20b64817346fbbea0b0756
2021-09-27[crdroid][11.0] SystemUI: Make center clock follow paddingTopcjh1249131356
neobuddy89: Instead apply paddingTop to center clock layout itself. Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I31c83d933bdb309d126c3196567eecfc0529a0e8
2021-09-27[crdroid][11.0] KeyguardClockPositionAlgorithm: Allow forcing default clockY ↵Christian Oder
positioning set clocks preferred Y coordinates to -1 to use default Y handling on custom clocks Change-Id: I4ce8106987e7aa1a5bb3da1865aa86ce99343e09
2021-09-27[crdroid][11.0] TypeClock: Properly calculate the heightEl Dainosor
As it was using the small clock all this time along. Let's get code for smallclock and add the dynamic height of the view Change-Id: I71889678b7a11245c8522a39c0cfd55d02d36d29
2021-09-27[crdroid][11.0] TypeClock: Typeface Clock: Fix thumbnailshagbag913
* Match actual typeface clock look and remove background. Change-Id: I0acaaf0b2a79fcb5e9954b2c504bca8c4fccd436
2021-09-27[crdroid][11.0] SystemUI: Restore typographic clock faceDanny Lin
This reverts commits 583067c4e4799b0a633d8e861698c8fc2a5c7a6f and 37fe8022174fc809ef4622f7d6c69f9bdff06913. This clock face still works fine and we can expose it in ThemePicker. Changes made for forward-porting to Android 11: - Added SmallClockPosition to manage preferred Y position - Adjusted resources class imports for res-keyguard merge - Updated arguments to ColorExtractor#getColors Change-Id: If75c593e3403962e1a7ffa6fae0734f785d79589
2021-09-27Revert "SystemUI: Restore analog and bubble clock styles"alk3pInjection
* unattractive and redundant This reverts commit bed7b35b56a5d45a0859e03147cfcc2b20e02493. Change-Id: I4442afba6350773b6399878a3504ce53cb892a73
2021-09-27[YAAP][eleven] FODCircleView: Don't show on top of assistant UIjhonboy121
* register a task stack change listener to hide fod when assistant is visibile in lockscreen * aosp implementation does not take fod into account so we have to register our own listeners idoybh: taken from AOSP-Krypton/frameworks_base@b9c454a and stripped down what we need. Ignore assistant UI when showing bouncer & Fix NPE Change-Id: I4b4927704fcb179826d914e529f9c43748464d9f
2021-09-27[aospa][quartz] VibratorService: bypass AppOps checkPark Ju Hyung
AppOps is randomly rejecting vibration calls from SystemUI. Bypass this check entirely to workaround it. This introduces a potential security issue where apps without android.permission.VIBRATE would be able to send vibrations, but the existing issue directly affects UX and outweighs the potential security issue. Change-Id: I5cc80eda2dbfe4a5baab95e961e98717ed5457f1 Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
2021-09-27VibratorService: update constant values for OnePlus HALcjh1249131356
Change-Id: I18cff6bfcca4ab38c5a7c47845fa9ac395a20921
2021-09-27[aospa][quartz] VibratorService: implement OnePlus proprietary vibrator formatrituj
OnePlus proprietary vibrator hal doesn't work the way the open-source one does. Add an encoding function to map the parameter(time in ms) to OnePlus HAL friendly format. Needs config_hasOnePlusHapticMotor=true. Change-Id: I393588fdc85a7f7f9d35a96f601b09f71e625370 Signed-off-by: rituj <ritujbeniwal@gmail.com> [alk3pInjection: Port to lineage-18.1] Signed-off-by: alk3pInjection <webmaster@raspii.tech>
2021-09-27[aospa][quartz] PhoneWindowManager: Improve hapticsrituj
Change-Id: I389ade5b2b3c098d78b7267d18c4056dbb7c72be Signed-off-by: rituj <ritujbeniwal@gmail.com>
2021-09-27[crdroid][11.0] VolumeDialog: always show ringer iconPranav Vashi
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: Ie184937404f1419723d18dd9468e679654f101fc
2021-09-27[aospa][ruby] VolumeDialog: Fix animation when ringer and notification are ↵Rituj Beniwal
unlinked Signed-off-by: Rituj Beniwal <ritujbeniwal@gmail.com> Change-Id: I92ab08edaa9d545f17f07093f421bf3b73e1d49a
2021-09-27fixup! VolumeDialog: avoid NPE in MediaOutputViewalk3pInjection
E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.String.equals(java.lang.Object)' on a null object reference E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl.updateMediaOutputViewH(VolumeDialogImpl.java:902) E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl.access$4800(VolumeDialogImpl.java:128) E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl$H.handleMessage(VolumeDialogImpl.java:1906) E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:106) E AndroidRuntime: at android.os.Looper.loop(Looper.java:223) E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:7664) E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method) E AndroidRuntime: at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592) E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:954) Change-Id: If4aa70fc7f4051a786dade8fd9ff124f3737786a
2021-09-27[aospa][quartz] SystemUI: Redesign volume dialogHrX03
Inspiration from MiUI, iOS and Dil3mm4 Change-Id: I8bddda04c83c995bec82e9493017db69bd460b34 Co-Authored-By: Andrew Fluck <andrew@aospa.co> Co-Authored-By: rituj <ritujbeniwal@gmail.com> Co-Authored-By: Jyotiraditya <jyotiraditya@aospa.co> Co-Authored-By: Akash Srivastava <akashsrivastava@aospa.co> Co-Authored-By: 00day0 <therandomuser11@gmail.com> Co-authored-by: Kshitij Gupta <kshitijgm@gmail.com> base: Redo expanded volume panel for 10.x [ HrX03 | AgentFabulous - POSP ] - Google nuked expanded volume panel in pie. Redo the current implementation to bring this back from the past and dejank it. - Back to Android 8.x functionality! Change-Id: Ie4931a4ae09483ba737a74fc32ed0a1f6acf105d Co-authored-by: Kshitij Gupta <kshitijgm@gmail.com> Signed-off-by: Arian <arian.kulmer@web.de> SystemUI: VolumePanel: Version 1.1 * Add support for unlinked notification volume * Fix progress bar inconsistencies when switching ringer modes * Some minor animation tweaks Change-Id: I31f87aacb7fbb445dd3b03ceb5064263e5af4836 VolumeDialogImpl: fix ConcurrentModificationException SDB: it's happening to only a few users and let make those fc free msg: java.util.ConcurrentModificationException stacktrace: java.util.ConcurrentModificationException at java.util.ArrayList$Itr.next(ArrayList.java:860) at com.android.systemui.volume.VolumeDialogImpl.updateMediaOutputViewH(VolumeDialogImpl.java:905) at com.android.systemui.volume.VolumeDialogImpl.access$4800(VolumeDialogImpl.java:120) at com.android.systemui.volume.VolumeDialogImpl$H.handleMessage(VolumeDialogImpl.java:1912) at android.os.Handler.dispatchMessage(Handler.java:106) at android.os.Looper.loop(Looper.java:223) at android.app.ActivityThread.main(ActivityThread.java:7657) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:594) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:947) VolumePluginManager: Fix fc for stock panel Change-Id: Ib0f6340ac7fea08abc637a1c3391a58cc4f1dfb6 VolumeDialogImpl: Reschedule the timeout on clicks on captions Change-Id: Ie98813a91396f3c3a84aeac8a609071c5cc315f6 VolumePanel: Fix glitchy ringer and notif bar when switching modes Co-Authored-By: Andrew Fluck <andrew@aospa.co> Co-Authored-By: rituj <ritujbeniwal@gmail.com> Co-Authored-By: Jyotiraditya <jyotiraditya@aospa.co> Co-Authored-By: Akash Srivastava <akashsrivastava@aospa.co> Co-Authored-By: 00day0 <therandomuser11@gmail.com> Co-authored-by: Kshitij Gupta <kshitijgm@gmail.com> Signed-off-by: rituj <ritujbeniwal@gmail.com> Signed-off-by: Arian <arian.kulmer@web.de> Signed-off-by: rituj <ritujbeniwal@gmail.com> Signed-off-by: althafvly <althafvly@gmail.com> Change-Id: I585c7366cb99c0c3baf699a5a553e77da895d195
2021-09-27[aospa][quartz] SystemUI: allow devices override audio panel locationa.derendyaev
Some devices have volume buttons on left side and it not fancy if volume panel will be at right side. You can override panel location using overlay for SystemUI: <!-- Allow devices override audio panel location to the left side --> <bool name="config_audioPanelOnLeftSide">true</bool> * Herna1994 : Fixed animation on left side panel. * Herna1994 : Adapted to Android 10. Signed-off-by: Hernán Castañón <herna@paranoidandroid.co> Change-Id: I4f111ec43c436b1c5ff81afea3f5d755bc8e7668 Volume panel: Do the same with less Change-Id: If41456f71ffd18466166e7b4120ff34d9e6f5a46 Signed-off-by: Hernán Castañón Álvarez <herna@paranoidandroid.co>
2021-09-27AlertSlider: Fix bad layout under 180° rotationalk3pInjection
* silly but it works Change-Id: I0c32980b9380cd5fc8b8204440ea93d73c6aabc4
2021-09-27[crdroid][11.0] AlertSlider: Prevent crash in case of incomplete broadcastPranav Vashi
* In intent extra EXTRA_SLIDER_POSITION_VALUE is not received and slider is changed, SystemUI will crash "No resource found". This patch should prevent such ice-cold havoc. Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: Ifc21327f785959db2e7cb0d03e07c0b061dfd569
2021-09-27[aospa][quartz] SystemUI: Hide ringer button if alert slider is presentHernán Castañón Álvarez
Change-Id: Ia0b3b095eed35b87bd81e2f96622391949f5b721
2021-09-27[aospa][quartz] SystemUI: Improve alert slider dialogAnushek Prasal
- Convert px to dip - Modify the dialog to match toast - Fix positioning for OP7 Pro slider - Remove unused dimens and drawables Edit: set position values to 0 for neutrality. They should be adapted by overriding in each device tree. Change-Id: I0dfb705843f52cdea470993d05a7bdedc10750f4
2021-09-27[aospa][quartz] SystemUI: Introduce user interface for Alert SlidersChris Crump
Ported from OxygenOS and reworked for our alert slider implementation. We target AudioManager instead of Zen, icons are also the same as aosp and the dialog uses the material theme as well as support for our themes. To use, the alert slider config must be enabled. By default, the dialog shows on the left side. To move it to the right side, set the location config to 1. Change-Id: Ie1954a44cc5242c95a731abd7404379ea638fe70
2021-09-27[aospa][quartz] policy: Add support for device alert slidersthecrazyskull
* Provide support for alert slider hardware. * Ability to swap order of alert slider within system setting. * Enable setting config_hasAlertSlider to true and defining proc nodes for state path and UEvent match path. * Contributors: Sirhc95 ZVNexus carlosavignano thecrazyskull Change-Id: I46f594923aedf3445ee9cecb16a90c4963f78a89
2021-09-27SystemUI: Revert expanding volume panelalk3pInjection
This reverts the following commits: 3ad13ef "SystemUI: VolumeDialogImpl: Fix volume panel permanently visible" b0675ce "VolumeDialogImpl: Get the location in window instead of on screen" 678a06b "VolumeDialogImpl: Remove insets listener on dismiss" f3512b3 "SystemUI: Bring back expanded volume panel" f6b7b1a "SystemUI: runtime configurable audio panel location" Change-Id: I318f709537f3fd7453f50f83c2b41729095dc2f0
2021-09-27SystemUI: Expose VPN icon to TunerLibXZR
This can be really useful for those who with vpn always on. Change-Id: I9bfce76e4475db0246aa0bc348119ced99574e8d
2021-09-27[crdroid][11.0] base: Add Reboot/Recovery QS Tilefusionjack
This squashed the following commits: Author: Pranav Vashi <neobuddy89@gmail.com> Date: Sun Nov 10 11:51:46 2019 +0530 RebootTile: Make default state inactive Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Author: Pranav Vashi <neobuddy89@gmail.com> Date: Thu May 3 03:45:46 2018 +0530 Extend reboot tile to add power off Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I0531b85c3a20ecacc71a9bf02872b2cc1b0a5be9 Author: Pranav Vashi <neobuddy89@gmail.com> Date: Sun Feb 11 10:59:39 2018 +0530 RebootTile: Fix gradient message display for reboot to recovery Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Author: fusionjack <dogfight60-fusionjack@yahoo.de> Date: Wed Nov 15 21:21:31 2017 -0500 Add Reboot/Recovery QS Tile Vectorized Reboot/Recovery QS tile drawables Alex Cruz <du.alexcruz@gmail.com> - Resized but reused the power menu reboot icon to keep things uniformed - Created a recovery vector that fits the same style too mydongistiny: Updated priv-app whitelist to fix boot Change-Id: I0762ffb2b3ddf8c833662a237bde20581e8cc614 Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: Ie99133e566a48d797edf98962380071c739e76ad
2021-09-27[crdroid][11.0] SystemUI: Allow user to add/remove QS with one clickAndrzej Ressel
Change-Id: Ied86dcfb6179d936786273867a50610900f1c5e5
2021-09-27[crdroid][11.0] SystemUI: Add side paddings for brightness sliderLaker
Change-Id: I2b5febb5dbdb53f14f6438122e15e0ca94c3d046
2021-09-27[ArrowOS][11.0] BurnInProtection: Fix null object reference with timermydongistiny
Happens when after flashing a build you let the screen turn off before unlocking Change-Id: I051b75531bf65c8cf3bbc4779fafdbae1a156686 Signed-off-by: mydongistiny <jaysonedson@gmail.com>
2021-09-27[ArrowOS][11.0] SystemUI: Implement burn-in protection for status/navbarPark Ju Hyung
Devices with OLED display suffer from status-bar's notification items and nagivation bar's software keys causing permanent burn-ins when used long-term. Moving all items in the area both horizontally and vertically workarounds this problem. This new feature can be enabled by setting config_statusBarBurnInProtection to true. The shifting interval can be configured with config_shift_interval. The default shifting interval is 60 seconds. Forward-ported to oreo-mr1. * Disable by default. Change-Id: I8df1ebc8bc0f359fe5a6a1fe11aa6201237a7359