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

761057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
f39e0145fe Merge "Fine tune Spinner style" into tm-dev am: e5ee7aa25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17620164

Change-Id: Iddd2e45551875059ce09c94ce06647015e3fd3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 04:58:33 +00:00
Eun-Jeong Shin
ef171fb8f7 Merge changes from topic "presubmit-am-6809d34469994644a50f20911d86acf1" into tm-mainline-prod 
* changes:
  [automerge] Handling exception when per-use prompt cannot be generated 2p: 4ae1ea9fba
  Handling exception when per-use prompt cannot be generated
 2022-04-13 04:42:13 +00:00
Edgar Wang
e5ee7aa25f Merge "Fine tune Spinner style" into tm-dev 2022-04-13 04:36:02 +00:00
TreeHugger Robot
398eb70920 Merge "AudioService: increase log size of device connection history" into tm-dev am: e33a37a865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707137

Change-Id: I31a5e975a0f1ac116ef92697859a7e80f9d9ff83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 04:27:59 +00:00
TreeHugger Robot
e33a37a865 Merge "AudioService: increase log size of device connection history" into tm-dev 2022-04-13 04:01:13 +00:00
TreeHugger Robot
c12b7a099c Merge changes from topic "presubmit-am-bbb2e523b7474f5fbf50acf046224c89" into tm-mainline-prod 
* changes:
  [automerge] AudioService: increase log size of device connection history 2p: 8313dd017c
  AudioService: increase log size of device connection history
 2022-04-13 04:01:12 +00:00
TreeHugger Robot
58e0a7cd39 Merge "Move codes to gerrit for CollapsingToolbar" into tm-dev am: 2ee49c0f04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665879

Change-Id: I8d92d46f335be11f72648c71e9d951ef0beed496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 02:30:17 +00:00
TreeHugger Robot
7190f18106 Merge "Extend providedInternalInsets to be type specific" into tm-dev am: 36d012ca1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352110

Change-Id: I63c9538b29f723029115b496a2688eb258c5cea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 02:29:35 +00:00
TreeHugger Robot
70116da78e Merge "GLFunctorDrawable: skip alpha filtering" into tm-dev am: ec839b2eb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697994

Change-Id: I0196af689e42fd72c0b114e04a5439f2cdc5d106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 02:28:42 +00:00
TreeHugger Robot
2ee49c0f04 Merge "Move codes to gerrit for CollapsingToolbar" into tm-dev 2022-04-13 02:26:38 +00:00
TreeHugger Robot
36d012ca1c Merge "Extend providedInternalInsets to be type specific" into tm-dev 2022-04-13 01:53:07 +00:00
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
ec839b2eb8 Merge "GLFunctorDrawable: skip alpha filtering" into tm-dev 2022-04-13 01:29:37 +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
eunjeongshin
fd231aa301 [automerge] Handling exception when per-use prompt cannot be generated 2p: 4ae1ea9fba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17722828

Bug: 228053177
Change-Id: I9d3f10007b0313f4409caa1d405db69eb32b849f
 2022-04-12 20:48:58 +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
eunjeongshin
4ae1ea9fba Handling exception when per-use prompt cannot be generated 
Add handling corner cases when the system fails to generate per-use prompt for
device log access. This change addresses when the passed package name is
null or the application info cannot be found.

Bug: 228053177
Test: CtsVerifier
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: I03058599332108821d461bbe38072a23bae2ed3c
 2022-04-12 20:42:43 +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