Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
678,315 Commits 3 Branches 0 Tags
6e021316d91ed8b25414c4adc6c51bf7bbf27baa
Commit Graph

678315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
6e021316d9 Merge "Making the AM team owner of some tests" am: 2c8647da7e am: f20afcb01b am: ba9387a044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889535

Change-Id: Ie371a814f1aba77290440d5b0bf275ede838e161
 2021-11-12 20:01:40 +00:00
Makoto Onuki
ba9387a044 Merge "Making the AM team owner of some tests" am: 2c8647da7e am: f20afcb01b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889535

Change-Id: Iaebf0aa5f0805c961b72c00730e3f60e195680e3
 2021-11-12 19:44:36 +00:00
Makoto Onuki
f20afcb01b Merge "Making the AM team owner of some tests" am: 2c8647da7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889535

Change-Id: Ie4ae86f0013a7a0212a7780ee13b64c87108d63e
 2021-11-12 19:26:34 +00:00
TreeHugger Robot
e0e7574629 Merge "Add SPLIT_TOUCH to UdfpsView" into sc-v2-dev am: decdf37b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16242364

Change-Id: I726a937df0a529b0c34f21ce50f26d180a92b1e7
 2021-11-12 19:26:22 +00:00
Treehugger Robot
6548038db4 Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" am: 9e742aa02f am: 5903b83fbd am: c7877bf5e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875777

Change-Id: I1fa43224cb597981bf1451fbb013b3e0f9d159ef
 2021-11-12 19:20:20 +00:00
TreeHugger Robot
decdf37b97 Merge "Add SPLIT_TOUCH to UdfpsView" into sc-v2-dev 2021-11-12 19:09:34 +00:00
Makoto Onuki
2c8647da7e Merge "Making the AM team owner of some tests" 2021-11-12 19:07:53 +00:00
Treehugger Robot
c7877bf5e5 Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" am: 9e742aa02f am: 5903b83fbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875777

Change-Id: I5e24cedfd54bf03a98028aa04c1428e5db7e77d8
 2021-11-12 19:03:22 +00:00
Treehugger Robot
5903b83fbd Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" am: 9e742aa02f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875777

Change-Id: I5e201b4918406ae4f8c15aca2153c35bb32406f1
 2021-11-12 18:52:35 +00:00
TreeHugger Robot
3986c77624 Merge "Keyguard Unfold" into sc-v2-dev am: d3fdb87c77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16240848

Change-Id: I0cc94ea46273dd6b9dfe32f24449c889527a5ce0
 2021-11-12 18:51:52 +00:00
TreeHugger Robot
d3fdb87c77 Merge "Keyguard Unfold" into sc-v2-dev 2021-11-12 18:44:36 +00:00
TreeHugger Robot
2484637c43 Merge "Fixed permisssions on setStopBackgroundUsersOnSwitch()." into sc-v2-dev am: 174e83c8ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224123

Change-Id: I8158038b500efbbb3aafe0e4dd342adb5cf07890
 2021-11-12 18:39:24 +00:00
Treehugger Robot
9e742aa02f Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" 2021-11-12 18:35:28 +00:00
TreeHugger Robot
174e83c8ec Merge "Fixed permisssions on setStopBackgroundUsersOnSwitch()." into sc-v2-dev 2021-11-12 18:34:04 +00:00
Michał Brzeziński
4db787a510 Merge changes from topic "lock_icon_move" into sc-v2-dev am: cdae07870c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214439

Change-Id: I65cba0cfb7b15b05b51543447fac7ca125b9424e
 2021-11-12 18:33:26 +00:00
Michal Brzezinski
92305b96d7 Moving now playing widget above lock icon in split shade am: 109831c3c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16183851

Change-Id: Ibabf052091a9e3624cc01521beecba6b37dc7b35
 2021-11-12 18:33:05 +00:00
Tyler Gunn
5876042192 Merge "Add links and usage context for telephony strings." am: dcb51970ab am: ccc651119d am: cecc90ee1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889877

Change-Id: I6cd6755f7a119d6372e5f8966bccbf1511e1b270
 2021-11-12 18:26:38 +00:00
Michał Brzeziński
cdae07870c Merge changes from topic "lock_icon_move" into sc-v2-dev 
* changes:
  Moving notifications and keyguard status higher in split shade lockscreen
  Moving now playing widget above lock icon in split shade
 2021-11-12 18:19:19 +00:00
Tyler Gunn
cecc90ee1b Merge "Add links and usage context for telephony strings." am: dcb51970ab am: ccc651119d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889877

Change-Id: I25a6d7d347307b982308f250f548c7a3df6c8158
 2021-11-12 18:13:18 +00:00
TreeHugger Robot
57e78478e9 Merge "Skip DevicePolicyManagerTest that are not supported on automotive." into sc-v2-dev am: 26492d0725 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222445

Change-Id: I18909b02cd35ebfb79547b69ef018922d70ca3dc
 2021-11-12 18:02:41 +00:00
Ben Lin
0d431ecbcb Merge "PiP: Enable enter split." into sc-v2-dev am: b61f021774 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241620

Change-Id: I1206fe1c37ed17e1599d88a23112cf399ab70a2d
 2021-11-12 18:01:58 +00:00
Tyler Gunn
ccc651119d Merge "Add links and usage context for telephony strings." am: dcb51970ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889877

Change-Id: Ic93f05531e766648f1c2f4533157d12c23fa233d
 2021-11-12 17:57:58 +00:00
TreeHugger Robot
26492d0725 Merge "Skip DevicePolicyManagerTest that are not supported on automotive." into sc-v2-dev 2021-11-12 17:51:24 +00:00
Ben Lin
b61f021774 Merge "PiP: Enable enter split." into sc-v2-dev 2021-11-12 17:47:00 +00:00
Tyler Gunn
dcb51970ab Merge "Add links and usage context for telephony strings." 2021-11-12 17:39:49 +00:00
Fiona Campbell
5c782095fd Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev am: c19c6d4b3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949362

Change-Id: Id404fc7aa4bcd32fe49363fad074953997fb66a9
 2021-11-12 17:27:40 +00:00
Fiona Campbell
c19c6d4b3c Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev 2021-11-12 17:10:15 +00:00
Matt Pietal
d631564700 Keyguard Unfold 
Support subtle x-axis movements of keyguard elements as the device
hinge is operated.

Bug: 201410717
Test: KeyguardUnfoldTransitionTest

Change-Id: Ic86b8316bbd07922e3d86a5fe7ff341ff5c7040e
 2021-11-12 11:50:53 -05:00
Jordan Demeulenaere
eb85b9efdb Merge "Fix regression when launching the media output dialog" into sc-v2-dev am: 64c7c7150f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16239524

Change-Id: If7f543bb13dbe2d6dcbf9adf479db5809548d06c
 2021-11-12 15:39:05 +00:00
Jordan Demeulenaere
64c7c7150f Merge "Fix regression when launching the media output dialog" into sc-v2-dev 2021-11-12 15:30:11 +00:00
TreeHugger Robot
59b95d4367 Merge "Check for the vibrate notification key on delayed vibrations" into sc-v2-dev am: 55d2c4c1aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16245406

Change-Id: I812a6d7ae35284f919332f03cb598a20452e2a61
 2021-11-12 14:09:10 +00:00
TreeHugger Robot
55d2c4c1aa Merge "Check for the vibrate notification key on delayed vibrations" into sc-v2-dev 2021-11-12 13:58:20 +00:00
Jordan Demeulenaere
79bd0cafdd Fix regression when launching the media output dialog 
This CL fixes a regression that was caused by ag/16191211: when opening
the media output dialog, we would animate from the media dialog content
instead of its parent (that has the dialog background).

This CL changes that by detecting that the view we are launching from is
actually the content of a dialog that was animated using
DialogLaunchAnimator, and animates its parent to also animate the
background.

See b/200781817#comment8 for before/after videos.

Bug: 200781817
Test: Manual
Change-Id: I20cf8bdff8b6d29e9aa458f96d65851a0298f98d
 2021-11-12 14:32:27 +01:00
Ahming Chen
1a96bf9381 [automerger skipped] Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e40017 -s ours am: 32b80a9dc7 -s ours 
am skip reason: Merged-In I80c9f887cf8b4714716d657da92ed273a532ce27 with SHA-1 f9520f6d7d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16191693

Change-Id: I9c346209879650a19f53d935d4096886f09e2cd7
 2021-11-12 11:18:44 +00:00
Ahming Chen
32b80a9dc7 [automerger skipped] Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e40017 -s ours 
am skip reason: Merged-In I80c9f887cf8b4714716d657da92ed273a532ce27 with SHA-1 f9520f6d7d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16191693

Change-Id: Ibd227e6b6ba55d278995d47d4bb86f00370e9d23
 2021-11-12 11:03:36 +00:00
Jordan Demeulenaere
c35d7beb06 Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev am: d7b0a36294 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16174250

Change-Id: Idde6c8d69dbe24f89d44df16092150ba9f78c8a9
 2021-11-12 10:57:28 +00:00
Ahming Chen
ae28e40017 Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev 2021-11-12 10:50:49 +00:00
Jordan Demeulenaere
d7b0a36294 Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev 2021-11-12 10:40:19 +00:00
Lais Andrade
6bd7a9c728 Check for the vibrate notification key on delayed vibrations 
Notifications played with sound have a delayed vibration, in order to
match the vibration and sound effects. If the effects are cleared before
the vibration starts, or a new one takes its place, then the vibration
hould be cancelled because it no longer will be tracked by the
NotificationManagerService.mVibrateNotificationKey.

This can cause repeating vibrations, like incoming calls, to start and
continue vibrating even after the notification was handled, (if the user
opens the notification panel before it actually starts vibrating, for
example).

Fix: 202752953
Test: NotificationManagerServiceTest
Change-Id: If3ed4a741e78058a321691acebe735c735542f16
Merged-In: If3ed4a741e78058a321691acebe735c735542f16
(cherry picked from commit 2bf7f52086)
 2021-11-12 10:29:53 +00:00
Jordan Demeulenaere
273dc06373 Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView 
This is a temporary fix to make #testShowDialogFromView pass on
git_master/cf_x86_64_phone-userdebug.

Bug: 204589809
Bug: 204561691
Test: https://android-build.googleplex.com/builds/abtd/run/L96200000951897805
Change-Id: I28fe649fde6a107ee939ae8e85090972899f5d17
 2021-11-12 10:05:33 +01:00
Fedor Kudasov
1572daff43 Merge "Add @Nullable annotations to Task fields" into sc-v2-dev am: 2d7f52505e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241227

Change-Id: I135271bb6990b3c8968632add827ed229a85accb
 2021-11-12 08:38:07 +00:00
Fedor Kudasov
2d7f52505e Merge "Add @Nullable annotations to Task fields" into sc-v2-dev 2021-11-12 08:18:32 +00:00
TreeHugger Robot
f9b9412168 Merge "Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME" into sc-v2-dev am: e171c540da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16197051

Change-Id: Id507a32c6035cfce5b03e5a531586e28d8edc106
 2021-11-12 06:29:16 +00:00
TreeHugger Robot
e171c540da Merge "Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME" into sc-v2-dev 2021-11-12 06:13:06 +00:00
Jeff Chang
d41841f469 Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME 
The flag will cause a newly launching task to be placed on top of the
current home activity task but it did ignore the lock-task mode
mechansim.

This CL checks the home task whether violated with lock-task mode when
startActivity with task-on-home flag.

Bug: 202980858
Test: atest TaskTests#testReturnsToHomeRootTask
      atest ActivityVisibilityTests#testLaunchTaskOnHome
Change-Id: I521b9e4fc32648263afb70de3342dbb5f3583330
 2021-11-12 12:10:11 +08:00
Gary Jian
389152b8f7 [automerger skipped] Merge "Added nr advanced calling settings support" am: ec84453381 am: c366188272 am: 6b576ad443 -s ours 
am skip reason: Merged-In Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 with SHA-1 6a837e5352 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885736

Change-Id: I5a95493c394f463f3194baeffb8d3280c6a70fb1
 2021-11-12 02:56:56 +00:00
Treehugger Robot
b159aa066b Merge "Fix hardware TvInputService binding issue" am: e27b9897c3 am: f71ccd329a am: 5cd05e3d40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873994

Change-Id: I3ea5d092a68c8a8a17af460000ecf62f76c2b8ff
 2021-11-12 02:56:14 +00:00
Gary Jian
6b576ad443 Merge "Added nr advanced calling settings support" am: ec84453381 am: c366188272 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885736

Change-Id: I981d300ed36a522f6ba39bad485cabe7f71926a8
 2021-11-12 02:39:05 +00:00
Treehugger Robot
5cd05e3d40 Merge "Fix hardware TvInputService binding issue" am: e27b9897c3 am: f71ccd329a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873994

Change-Id: I3aff7ec77bc4d7bc29453ceabee58de6f949b59b
 2021-11-12 02:38:12 +00:00
Gary Jian
c366188272 Merge "Added nr advanced calling settings support" am: ec84453381 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885736

Change-Id: I76450176fd6980bae9c9abfcc36f3e6bf6c798e7
 2021-11-12 02:28:15 +00:00