Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
759,398 Commits 3 Branches 0 Tags
07aba18a6ca2b616c59ffdf6474c1b02abafbdf2
Commit Graph

759398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miguel Aranda
07aba18a6c Merge "Even more libcore benchmark tests." am: 14fff66fa2 am: 6bfa1645f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2074938

Change-Id: I2ea7b85d3670ff54a8bc1b0abc06e6fa0afba46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:14:38 +00:00
Lucas Lin
cbc6745aee Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED" am: c45eb2877a am: 76e4e498e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951462

Change-Id: I3ffc91d77a708ad1cc1fa6ab07f2e1288bef67ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:13:01 +00:00
Colin Cross
41d8b8e270 [automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" am: b61b9e11b4 am: 77449e956c -s ours 
am skip reason: Merged-In I9e793fb569f1bd6568b951d908d483fb4acfcd8c with SHA-1 95888176f2 is already in history

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

Change-Id: Iec67e5ddbddbac41d78bc04e0cf3384412940a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:56:03 +00:00
Miguel Aranda
6bfa1645f9 Merge "Even more libcore benchmark tests." am: 14fff66fa2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2074938

Change-Id: Iaa17e7f4654614e685660aecc18e35f7809e776b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:54:24 +00:00
Lucas Lin
76e4e498e8 Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED" am: c45eb2877a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951462

Change-Id: I03bb4d1ff90cb7b62db4ce2b8711626e59bca58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:53:38 +00:00
Colin Cross
77449e956c Merge "Update SysUI to be compatible with latest Jetpack libraries" am: b61b9e11b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2074044

Change-Id: I233ee21761ff917251a6870383bf0c8e008d4449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:50:58 +00:00
Eric Biggers
d33da280ed Merge "Zygote: clean up comment for isolateAppData()" am: 9f5d4a5b83 am: cef17205b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2078398

Change-Id: I3561b04b0e89d3fa9d7c256c55f1646f6b7e9996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:49:06 +00:00
Ganesh Olekar
f151113776 Merge "Update owners for Permissions & Privacy" am: bde2853623 am: 92b54153a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2078300

Change-Id: Ie759ae2f328a94a921ed29732d026b9c67359ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:48:00 +00:00
Treehugger Robot
b4137f0748 Merge "speech: Add andreaambu@ to OWNERS" am: 72c2c6e07a am: 2af20d0f3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2079618

Change-Id: I838d0dfd2a399a84940b19dbcbb915de8fedd164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:45:52 +00:00
Eric Biggers
cef17205b1 Merge "Zygote: clean up comment for isolateAppData()" am: 9f5d4a5b83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2078398

Change-Id: I0d5b907d127d10d0508acf31870d8d00e918c474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:24:06 +00:00
Ganesh Olekar
92b54153a6 Merge "Update owners for Permissions & Privacy" am: bde2853623 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2078300

Change-Id: Icb1b63815afbc8e1c75398c06e1e294d55c1ad9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:22:37 +00:00
Treehugger Robot
2af20d0f3e Merge "speech: Add andreaambu@ to OWNERS" am: 72c2c6e07a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2079618

Change-Id: Ied3f457bcf74b14f1a3412a11fd862c4a4acdfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:19:56 +00:00
Taran Singh
cd4b0f2cc4 Merge "Fix InputConnection creation callback" into tm-dev am: d5bb81348c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17896003

Change-Id: I8f4cab3d4daad7ca25faa04a9b6bb61db18bbd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:10:12 +00:00
Taran Singh
d5bb81348c Merge "Fix InputConnection creation callback" into tm-dev 2022-04-29 18:58:36 +00:00
Jeff DeCew
1310baf2c5 Merge "New pipeline: Separate stability rules for group pruning from group changing" into tm-dev am: baafc8b1ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030065

Change-Id: I551dd8db8c8eb3e70b2c58f2ef83212bda32bea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:50:40 +00:00
Jeff DeCew
baafc8b1ea Merge "New pipeline: Separate stability rules for group pruning from group changing" into tm-dev 2022-04-29 18:41:23 +00:00
Aaron Liu
aa1c06a19e Merge "[Bouncer] Add condition to keep keyboard hidden" into tm-dev am: 3600867ca9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17968372

Change-Id: I6135d4241de1709a95c8d7e36cc6b69c73b1605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:41:13 +00:00
Aaron Liu
60f348e535 Merge "[Bouncer] fix user switch race condition" into tm-dev am: 60f8672e42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958492

Change-Id: I1a60a7769b2d05e84c817fcc62b888433346008f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:40:55 +00:00
Aaron Liu
3600867ca9 Merge "[Bouncer] Add condition to keep keyboard hidden" into tm-dev 2022-04-29 18:33:07 +00:00
Aaron Liu
60f8672e42 Merge "[Bouncer] fix user switch race condition" into tm-dev 2022-04-29 18:32:50 +00:00
Dave Mankoff
33d8e5e7e7 Merge changes from topic "b229228871-cs-interface" into tm-dev am: 44217582dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17896370

Change-Id: I11e079f842ed4008c9882b6c5471d7aec7e979cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:46 +00:00
Dave Mankoff
11be5356eb Make CentralSurfaces an Interface. am: ee4838630c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17756836

Change-Id: I3669def18cd1c8cd590f36263ca3a0563a18ba09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:42 +00:00
Dave Mankoff
44217582dd Merge changes from topic "b229228871-cs-interface" into tm-dev 
* changes:
  Rename CentralSurfacesInt back to CentralSurfaces.
  Make CentralSurfaces an Interface.
 2022-04-29 18:07:15 +00:00
Vinh Tran
197bbecdef Merge "Remove sdk_version if platform_apis is set" am: ac9b99119c am: 3e589c33ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065675

Change-Id: Iab42e3f1cb56bd03f503d1a093a08869a7cc1f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:06:41 +00:00
Automerger Merge Worker
f2df35dcf6 Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d48 am: 1b11ca259f" into tm-dev-plus-aosp 2022-04-29 18:06:20 +00:00
TreeHugger Robot
541bd2acc7 Merge "[Media] Add logging to ResumeMediaBrowser for connections and disconnections." into tm-dev am: 38b22faf89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030426

Change-Id: I9d905766776c7e36ff9eeb799ee00826948544e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:06:09 +00:00
Nikita Ioffe
5ba3e27ee2 Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d48 am: 1b11ca259f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077481

Change-Id: I2460caab6cc99a42fd170b9f39c6b4b6f544d347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:53 +00:00
Lyn Han
7de9d66c03 Merge "Allow overlap between notifications and lock icon" into tm-dev am: 4428695415 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17843770

Change-Id: I4a21cbbeb145ac4f919e13054363ec3b9483b7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:50 +00:00
Rambo Wang
1f2d3f19c9 Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" into tm-dev am: 0817165aca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086357

Change-Id: I8efc68b3ea26207dc4c4660f01d70eb2565ee561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:24 +00:00
Lucas Dupin
12997c24cd Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when it changes." into tm-dev am: 9059ca6701 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982088

Change-Id: Ic3c298d4e20c50b94947b5514f416f6fb33b2af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:04:56 +00:00
Justin Weir
ca83c22161 Merge "Fix warnings" into tm-dev am: f3aafb7a2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982121

Change-Id: I92f8ac1f2c52e51c529377542e12f29ccc212e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:04:29 +00:00
Automerger Merge Worker
47fb75da8b Merge "Merge "Add experiment flag namespace for Multi-Gen LRU" am: d7145d4c0f am: f72a1a5973" into tm-dev-plus-aosp 2022-04-29 18:04:09 +00:00
Shuzhen Wang
8264c86037 Merge "Camera: Update timestamp base doc for SurfaceTexture" into tm-dev am: c1a0dc2c61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17824805

Change-Id: I368d3ec6953bb345746c4019836b656bcbb855cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:04:02 +00:00
Kalesh Singh
dd827b3b60 Merge "Add experiment flag namespace for Multi-Gen LRU" am: d7145d4c0f am: f72a1a5973 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056441

Change-Id: I465a51160aa02f9b6ecba0a70cd528b1d43c04f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:03:50 +00:00
TreeHugger Robot
25a401d506 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode" into tm-dev am: 6dba362ef1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752391

Change-Id: Ic0d33f66d1565370969dbf9976f984bf778340bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:03:22 +00:00
shaoweishen
99ca55f1b8 DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode am: 60607fd810 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752391

Change-Id: I5c58be3573963405228ef47bcde7e86a9248ba51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:03:19 +00:00
Automerger Merge Worker
4df197df89 Merge changes from topic "am-814bd07fbc6b45148064c8aedcfcdaba" into tm-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "227137943" am: 2f48177cbe am: 945d15b1fc -s ours
  [automerger skipped] Support IUsb AIDL interface am: b09d68a2ea am: 4a61540d9f -s ours
 2022-04-29 18:02:27 +00:00
TreeHugger Robot
6213b3aa4c Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev am: 75948e85b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938076

Change-Id: If580f5a46ae3a7f05d12af07e034d03f40dcad8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:02:07 +00:00
Treehugger Robot
142a720372 [automerger skipped] Merge changes from topic "227137943" am: 2f48177cbe am: 945d15b1fc -s ours 
am skip reason: Merged-In I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f with SHA-1 1b46333208 is already in history

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

Change-Id: I4afe34208ab26190cfa062ffde9c7693f9b7d997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:49 +00:00
Badhri Jagan Sridharan
a3b619ccf2 [automerger skipped] Support IUsb AIDL interface am: b09d68a2ea am: 4a61540d9f -s ours 
am skip reason: Merged-In I246fd6e5bee8138d3ad3b6994665a1d4788c8789 with SHA-1 bbfa92e694 is already in history

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

Change-Id: I28e9ea06c24adaacb7aadc12877d9d96cba00cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:30 +00:00
Beth Thibodeau
5381e194bc Merge "Update when PlaybackState state or actions change" into tm-dev am: 80017b1f2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18014216

Change-Id: I08696a19e0c84ed4fb9f350243d5fbf109b9fdd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:05 +00:00
TreeHugger Robot
38b22faf89 Merge "[Media] Add logging to ResumeMediaBrowser for connections and disconnections." into tm-dev 2022-04-29 17:47:31 +00:00
Lyn Han
4428695415 Merge "Allow overlap between notifications and lock icon" into tm-dev 2022-04-29 17:38:00 +00:00
Rambo Wang
0817165aca Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" into tm-dev 2022-04-29 17:33:26 +00:00
Lucas Dupin
9059ca6701 Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when it changes." into tm-dev 2022-04-29 17:29:51 +00:00
Justin Weir
f3aafb7a2f Merge "Fix warnings" into tm-dev 2022-04-29 17:28:42 +00:00
Shuzhen Wang
c1a0dc2c61 Merge "Camera: Update timestamp base doc for SurfaceTexture" into tm-dev 2022-04-29 17:27:23 +00:00
Rambo Wang
80b47e83f6 Fix race condition when TelephonyRegistry handles multi-SIM config change 
TelephonyRegistry only updates some internal statuses related to
active modem count after receiving ACTION_MULTI_SIM_CONFIG_CHANGED.
If another component receives the same intent firstly and calls
TelephonyRegistryManager to either register or notify an event,
the internal status related to active modem count may not be able
to update yet, causing IAE saying e.g. phoneId is invalid.

To fix the issue, onMultiSimConfigChanged will be called to update
the internal statuses firstly before accessing them.

Bug: 230799289
Fix: 230773760
Test: atest TelephonyRegistryTest
Test: manual DS<->SS switching test
Change-Id: I31506a07406dee424546bfe4927e069280a7b011
 2022-04-29 17:21:53 +00:00
TreeHugger Robot
6dba362ef1 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode" into tm-dev 2022-04-29 17:17:36 +00:00
TreeHugger Robot
75948e85b8 Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev 2022-04-29 17:17:30 +00:00