Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,038 Commits 3 Branches 0 Tags
7dd058e54ded0862f6c838b8cc4e80abb29854d2
Commit Graph

761038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7dd058e54d Merge changes from topic "ProvideTypedInsetsFrames" into tm-mainline-prod 
* changes:
  [automerge] Extend providedInternalInsets to be type specific 2p: 72e2997f31
  Extend providedInternalInsets to be type specific
 2022-04-13 01:53:04 +00:00
Treehugger Robot
46ceccfe41 Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab am: 9db4acd342 am: 43f42ced37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: I698a69c89b9de627c95cbd1927a39e99b322e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 01:08:06 +00:00
Songchun Fan
59a98ffb14 Merge "Lock for AppsFilter" into tm-dev am: f5e3cd3ec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17675239

Change-Id: Ie74db22e1c4d56694927b5fa3c21877ce4b25c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 01:07:06 +00:00
Treehugger Robot
43f42ced37 Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab am: 9db4acd342 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: Id90b29c3072080c8cbc08ce26be1c92b77a80ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:51:33 +00:00
Songchun Fan
f5e3cd3ec6 Merge "Lock for AppsFilter" into tm-dev 2022-04-13 00:44:54 +00:00
TreeHugger Robot
9d5ab9660b Merge "Camera: Improve documentation for 3A regions" into tm-dev am: 7af7fcbeb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17450512

Change-Id: Ife6814c6f0906c820b7570052f616cb0083325cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:30:32 +00:00
Songchun Fan
bd798bb2ad Merge "[pm] fix platinum test mapping" into tm-dev am: 082d5f3aad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699365

Change-Id: I90600c4563a3990af60cd3bebad615b6f226ebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:30:00 +00:00
Sudheer Shanka
e7282659ef Merge "Fix the @RequiresPermission annotation." into tm-dev am: 8338395749 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698251

Change-Id: If885c18d6af186f22e9f51f599ebf7e55de144a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:27:46 +00:00
TreeHugger Robot
8e177ad51b Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17701596

Change-Id: I620330023e40a8a961a4558de3ce2d59be6abeca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:26:56 +00:00
Treehugger Robot
9db4acd342 Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: I402c41eddc36a072f768cf261c04ae8261902df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:26:34 +00:00
TreeHugger Robot
7af7fcbeb0 Merge "Camera: Improve documentation for 3A regions" into tm-dev 2022-04-12 23:38:05 +00:00
Songchun Fan
082d5f3aad Merge "[pm] fix platinum test mapping" into tm-dev 2022-04-12 23:17:50 +00:00
Treehugger Robot
cbd6b9bbab Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: I46558bef859c120a55658afa2512494d7081677d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 23:12:30 +00:00
Sudheer Shanka
8338395749 Merge "Fix the @RequiresPermission annotation." into tm-dev 2022-04-12 23:11:37 +00:00
TreeHugger Robot
05beaec741 Merge changes from topic "presubmit-am-12354d5aed1b43208d3598174f1f4717" into tm-mainline-prod 
* changes:
  [automerge] Add and update some hotword detection metrics 2p: ee5e2a7a3f
  Add and update some hotword detection metrics
 2022-04-12 23:11:32 +00:00
TreeHugger Robot
5e1904c323 Merge "Add and update some hotword detection metrics" into tm-dev 2022-04-12 23:11:32 +00:00
Treehugger Robot
e9e88881a2 Merge "Add keylayout mapping for Xbox360 compatible controllers." 2022-04-12 22:52:03 +00:00
Keith Mok
b8b8a01c83 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: I8caf99669bf1bd826d4b7ebc46718eba186fe5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 22:06:32 +00:00
Keith Mok
39eb41b554 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: Ic358f331fe0f0ed11bddf6cc4a628816b47505c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 21:42:23 +00:00
Keith Mok
00c2754219 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: I0c666cabb02088e6ed13d81a03047ef0f4e338b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 21:18:45 +00:00
TreeHugger Robot
74a0ff11db Merge "Fix NPE in AppsFilter" into tm-dev am: 19412da261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17668627

Change-Id: I789e84232cebb0e68106721adc01005f4033f0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 21:18:27 +00:00
Keith Mok
43567ad451 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: I3793c1faa5c520835ae196ec027242803c5ff11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 20:42:46 +00:00
TreeHugger Robot
19412da261 Merge "Fix NPE in AppsFilter" into tm-dev 2022-04-12 20:41:40 +00:00
TreeHugger Robot
a439a9a9e9 Merge changes from topic "presubmit-am-d2fb8e1cab9f469d997bbe6f898c6870" into tm-mainline-prod 
* changes:
  [automerge] Fix NPE in AppsFilter 2p: dd2636a4f8
  Fix NPE in AppsFilter
 2022-04-12 20:41:40 +00:00
Keith Mok
b1fb01e8b5 Merge "android_util_Process: fix length checking logic" 2022-04-12 20:15:46 +00:00
Yurii Zubrytskyi
0139794bb9 Merge "frameworks/base - Tiramisu is now 33" into tm-dev am: 595ec5f75c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699091

Change-Id: I4a8ea7de67cb9a29c467fafac75cd063b5468a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 19:57:42 +00:00
Chavi Weingarten
01965abc57 Merge "Default to true for updateDestinationFrame in BBQ" into tm-dev am: 40019d844a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693701

Change-Id: I1f2da4b91c0158cead64d1ecad13d9c2698eadbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 19:56:16 +00:00
Songchun Fan
9aae5e019c Lock for AppsFilter 
mLock to ensure the list fields are synchronized when a snapshot is
taken which prevents stale snapshots.

BUG: 226668722
Test: atest AppsFilterImplTest
Change-Id: Ia068f9074f22edd625bdbe781eec1593bff45cfb
 2022-04-12 19:33:12 +00:00
Yurii Zubrytskyi
595ec5f75c Merge "frameworks/base - Tiramisu is now 33" into tm-dev 2022-04-12 19:29:10 +00:00
Chavi Weingarten
3f096a943a Merge changes from topic "presubmit-am-699bcbdaa9a54be3a56de1e065ef795a" into tm-mainline-prod 
* changes:
  [automerge] Default to true for updateDestinationFrame in BBQ 2p: 845d5ad06e
  Default to true for updateDestinationFrame in BBQ
 2022-04-12 19:27:48 +00:00
Chavi Weingarten
40019d844a Merge "Default to true for updateDestinationFrame in BBQ" into tm-dev 2022-04-12 19:27:48 +00:00
Miranda Kephart
14a14a970a Merge "Fix button ripple colors for screenshot/clipboard overlay" into tm-dev am: 24f2f55b6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17638183

Change-Id: I4e1a5ef0a2f9d907b248045ba7bb0a5c5de1e180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 19:14:26 +00:00
Anton Hansson
e56c4bd75e Merge "Fix mistake in disting of api txt" am: 89ee3e6394 am: fc4d75a149 am: 26554faaf2 am: dc3afbe3ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: Ie164550474d04b1ca4e5a0acb94b7cb469658959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 19:13:26 +00:00
Miranda Kephart
24f2f55b6d Merge "Fix button ripple colors for screenshot/clipboard overlay" into tm-dev 2022-04-12 18:55:06 +00:00
Miranda Kephart
85da2f98d5 Merge changes from topic "presubmit-am-74daf7c195b84a66ae08146119ceca44" into tm-mainline-prod 
* changes:
  [automerge] Fix button ripple colors for screenshot/clipboard overlay 2p: b68328ba98
  Fix button ripple colors for screenshot/clipboard overlay
 2022-04-12 18:55:05 +00:00
Anton Hansson
dc3afbe3ca Merge "Fix mistake in disting of api txt" am: 89ee3e6394 am: fc4d75a149 am: 26554faaf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: I15e56be28fe46471aa63aa123c757bce6512d3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 18:54:06 +00:00
Anton Hansson
26554faaf2 Merge "Fix mistake in disting of api txt" am: 89ee3e6394 am: fc4d75a149 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: I46b23d881537fd88b8b719233d455bfd7897d03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 18:32:58 +00:00
Anton Hansson
fc4d75a149 Merge "Fix mistake in disting of api txt" am: 89ee3e6394 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: I62a1cc51023fc5f7441f0a9de4596015304d30af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 18:16:20 +00:00
TreeHugger Robot
ce0d3d64e0 Merge "[Bouncer] Apply interpolation to udfps" into tm-dev am: d405fc4491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17660987

Change-Id: Ie836ef10d771d74baddf40a03a84c01708deaa31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 18:08:26 +00:00
Anton Hansson
89ee3e6394 Merge "Fix mistake in disting of api txt" 2022-04-12 17:56:26 +00:00
TreeHugger Robot
d405fc4491 Merge "[Bouncer] Apply interpolation to udfps" into tm-dev 2022-04-12 17:45:43 +00:00
TreeHugger Robot
b2e9485cb1 Merge changes from topic "presubmit-am-bc07d8feb3004d48aa07bf8ab49f6ece" into tm-mainline-prod 
* changes:
  [automerge] [Bouncer] Apply interpolation to udfps 2p: caa6359dbe
  [Bouncer] Apply interpolation to udfps
 2022-04-12 17:45:43 +00:00
TreeHugger Robot
e5a2559cf7 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7b23f67adc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17406377

Change-Id: Iec35bf869f34ef8cdbc180c03f11174b88c377e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:28:52 +00:00
Matt Pietal
fe132e0b6b [automerger skipped] Merge "User switcher - Update when multiple users enabled/disabled" into tm-dev am: 287c009326 -s ours 
am skip reason: Merged-In Idbaf97c599bacba2122cbce2d047eb59262ac63e with SHA-1 6f9dae7fe0 is already in history

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

Change-Id: Id91b23f387dcc6e68669cba8b1d508010d4f9822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:28:04 +00:00
Nate Myren
0abf8a17fb [automerger skipped] Merge "Exempt TV devices from Notification Permission" into tm-dev am: 3d5fff0b80 -s ours 
am skip reason: Merged-In I9aeef86871ab7ca912cc30e1cf4ebd84d7014992 with SHA-1 3a7a73f58d is already in history

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

Change-Id: I7106ecfd363159f05844bc201974227953fde0d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:26:46 +00:00
Steven Moreland
ccb2ce7d07 Merge changes from topic "aidl-java-api-ci" into tm-dev am: b8b05de22f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575228

Change-Id: I79782bbe5788f487725d323a08f973f15a56effd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:24:56 +00:00
TreeHugger Robot
7b23f67adc Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev 2022-04-12 17:24:06 +00:00
Songchun Fan
1ae2bcd605 [pm] fix platinum test mapping 
+ Use hostside test class for SplitTest
+ Remove duplicated PackageParserTest

BUG: 140252512
Test: manual
Change-Id: I73bdceb0c5b333041b96cd777790c0ba0cece0e0
 2022-04-12 17:24:04 +00:00
Beverly Tai
1093dc27d9 Merge "AuthRipple should always animate lightReveal on auth" into tm-dev am: 3fb8f5d5db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17615628

Change-Id: I1a90fcb08949738b77ddb07f3464e906412f1e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:20:37 +00:00
Julia Reynolds
a29a7d6e93 [automerger skipped] Merge "Fix autogroupsummary bug" am: 15e5749d4b am: b5d8f6a658 am: 5378a82b02 -s ours am: bea3673553 -s ours 
am skip reason: Merged-In I0d14daaa69a94c1a3fe81b12d16b44e3a78281fe with SHA-1 9f292b5663 is already in history

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

Change-Id: Ia14fae50449b3f36a81853ce9eebfeb361b5de6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 17:20:15 +00:00