Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
688,528 Commits 3 Branches 0 Tags
ffdfacae548b032d369d8f2bd6d7093fda250fe3
Commit Graph

688528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
ffdfacae54 [automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am: 5409ef1ab7 -s ours 
am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c5358 is already in history

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

Change-Id: I16e893fc953d656d5af2f2c8a5351128ba06918d
 2022-02-15 00:14:49 +00:00
Xin Li
5409ef1ab7 Merge "Merge SP2A.220305.012" into stage-aosp-master 2022-02-14 23:57:02 +00:00
Alex Stetson
d985a0350d [automerger skipped] Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into sc-v2-dev am: 77642029bf -s ours 
am skip reason: Merged-In I07739b5763f78580475476aa81d5d1297f956fde with SHA-1 f2f306e68c is already in history

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

Change-Id: I5e9f7e812eefd0afe0a90626d33b77d60990d494
 2022-02-14 21:54:17 +00:00
Alex Stetson
e4ed25e393 Merge changes from topic "presubmit-am-b4fb8f57ee1646d4b98b58ae2008c663" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Replace StatusBarKeyguardViewManager with KeyguardViewController 2p: f2f306e68c
  Replace StatusBarKeyguardViewManager with KeyguardViewController
 2022-02-14 21:43:23 +00:00
Alex Stetson
77642029bf Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into sc-v2-dev 2022-02-14 21:43:22 +00:00
Fabian Kozynski
ff8763620b [automerger skipped] Merge "Remove QQS brightness controller" into sc-v2-dev am: 411deb3ac2 -s ours 
am skip reason: Merged-In I63501bf573e006f52379192b7b766283fea40dda with SHA-1 32b7c35f24 is already in history

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

Change-Id: I64d23b68ea18ee5a6baac45f31cbe70ac5ed1774
 2022-02-14 21:35:48 +00:00
Fabian Kozynski
411deb3ac2 Merge "Remove QQS brightness controller" into sc-v2-dev 2022-02-14 21:24:12 +00:00
Fabian Kozynski
6b5cdaf9f8 Merge changes from topic "presubmit-am-cbc644a75a634fa49a2e0c5860314968" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Remove QQS brightness controller 2p: 32b7c35f24
  Remove QQS brightness controller
 2022-02-14 21:24:12 +00:00
Rambo Wang
0b5def20fb Merge "Protect SID and NID in ServiceState with coarse location permission" am: 7013bca07a am: 5dbc71e1f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978547

Change-Id: I08d2bab62b1bdbc9eaaf0a562880d352e6437f2f
 2022-02-14 20:34:15 +00:00
Rambo Wang
5dbc71e1f0 Merge "Protect SID and NID in ServiceState with coarse location permission" am: 7013bca07a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978547

Change-Id: I59b6531d71bdb5995f3402a1ea69d021a6a6d4d4
 2022-02-14 20:23:01 +00:00
Xin Li
2b87be68b8 Merge SP2A.220305.012 
Bug: 219523960
Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60
Change-Id: I67693156d705f2488fe18149d2dd02d529f009ff
 2022-02-14 20:06:38 +00:00
Rambo Wang
7013bca07a Merge "Protect SID and NID in ServiceState with coarse location permission" 2022-02-14 20:03:48 +00:00
TreeHugger Robot
5378ffc63b Merge "Remove toast window token after being rate-limited" into sc-v2-dev am: a31d7cd698 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16871451

Change-Id: Id5efb8b1d1f6b0456de7de722e74314965db199c
 2022-02-14 19:03:32 +00:00
TreeHugger Robot
a31d7cd698 Merge "Remove toast window token after being rate-limited" into sc-v2-dev 2022-02-14 18:46:51 +00:00
TreeHugger Robot
f292c47a4a Merge changes from topic "presubmit-am-7202d37c8a894cf5bad2907ea7bd2625" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Remove toast window token after being rate-limited 2p: f53f2ad864
  Remove toast window token after being rate-limited
 2022-02-14 18:46:51 +00:00
Automerger Merge Worker
22e34be259 Merge "[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1be -s ours" into sc-v2-dev-plus-aosp 2022-02-14 18:11:25 +00:00
TreeHugger Robot
465686fd2c [automerger skipped] Merge "In repeat callers, record tel: URIs separately from other people strings." into sc-v2-dev am: 12a16ba054 -s ours 
am skip reason: Merged-In I84870436d5d8c6f24a57d4e54b848730a4c03778 with SHA-1 3606233206 is already in history

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

Change-Id: Ieeaaac4168e68ab78a92ff14d805a91f8e54587c
 2022-02-14 18:07:26 +00:00
TreeHugger Robot
ec3dcda976 Merge "DO NOT MERGE DozeScreenState unregisters for AuthControllerCB" into sc-v2-dev am: ebf49d75fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16838784

Change-Id: I7cd8210c43f2af4386845dab36e323336ee78bb5
 2022-02-14 18:06:42 +00:00
Xin Li
0b0e6f043c [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1be -s ours 
am skip reason: Merged-In I8cfa435bb6233818adb9cc99dadeeb06a03443d5 with SHA-1 0ca70fff40 is already in history

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

Change-Id: I2bfcd06308c70f33b89c01a4164e92bd084e0ec4
 2022-02-14 18:04:00 +00:00
TreeHugger Robot
12a16ba054 Merge "In repeat callers, record tel: URIs separately from other people strings." into sc-v2-dev 2022-02-14 17:44:16 +00:00
TreeHugger Robot
7c9dca14f5 Merge changes from topic "presubmit-am-344a4e064be547fabf508c6fde165c12" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] In repeat callers, record tel: URIs separately from other people strings. 2p: 3606233206
  In repeat callers, record tel: URIs separately from other people strings.
 2022-02-14 17:44:16 +00:00
Automerger Merge Worker
6c519d8e72 Merge "Merge "OWNERS for widget coretests" am: 5a3337e077 am: d8a7c9ef82" into sc-v2-dev-plus-aosp 2022-02-14 17:43:30 +00:00
TreeHugger Robot
ebf49d75fc Merge "DO NOT MERGE DozeScreenState unregisters for AuthControllerCB" into sc-v2-dev 2022-02-14 17:43:20 +00:00
TreeHugger Robot
a5131655fa Merge changes from topic "presubmit-am-2e7f765efd5f4949a381b8eb282b2dcc" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] DO NOT MERGE DozeScreenState unregisters for AuthControllerCB 2p: 0d4aa6312a
  DO NOT MERGE DozeScreenState unregisters for AuthControllerCB
 2022-02-14 17:43:20 +00:00
Treehugger Robot
f46aee3b2c Merge "OWNERS for widget coretests" am: 5a3337e077 am: d8a7c9ef82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984629

Change-Id: I56b11606447394e841ba508b1996948529df2832
 2022-02-14 17:43:20 +00:00
Xin Li
a6a261b1be Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:12 +00:00
Treehugger Robot
d8a7c9ef82 Merge "OWNERS for widget coretests" am: 5a3337e077 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984629

Change-Id: I867696d9008c7fd4bcb24ce03ec3a32aca76cc88
 2022-02-14 17:24:39 +00:00
Treehugger Robot
34fe73e15f Merge "Fix cert-dcl16-c warnings" am: d78c0842df am: a4e7dfab4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977907

Change-Id: I4ae11f4853a0b69267521b13b1c61b167b6b29e6
 2022-02-14 17:18:58 +00:00
Presubmit Automerger Backend
02b9c2ed7a [automerge] Replace StatusBarKeyguardViewManager with KeyguardViewController 2p: f2f306e68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16737208

Bug: 214617520
Change-Id: I0040fae678fcf17af3b38b8e5b45224793246288
Merged-In: I07739b5763f78580475476aa81d5d1297f956fde
 2022-02-14 17:14:39 +00:00
Alex Stetson
f2f306e68c Replace StatusBarKeyguardViewManager with KeyguardViewController 
Not all Android verticals use the StatusBarKeyguardViewManager. To
prevent breakages on these alternative platforms, the more generic
KeyguardViewController should be used instead.

Bug: 214617520
Test: manual (on oriole & oriole_car), atest MediaHierarchyManagerTest
Change-Id: I07739b5763f78580475476aa81d5d1297f956fde
Merged-In: I07739b5763f78580475476aa81d5d1297f956fde
 2022-02-14 17:14:29 +00:00
Treehugger Robot
5a3337e077 Merge "OWNERS for widget coretests" 2022-02-14 17:09:18 +00:00
Treehugger Robot
a4e7dfab4c Merge "Fix cert-dcl16-c warnings" am: d78c0842df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977907

Change-Id: I934aa6adbc76dce763af8f0b12fb899e734348c3
 2022-02-14 16:55:08 +00:00
Treehugger Robot
d78c0842df Merge "Fix cert-dcl16-c warnings" 2022-02-14 16:37:57 +00:00
Beverly
0dec19cc9e [automerge] Remove toast window token after being rate-limited 2p: f53f2ad864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16871451

Change-Id: I3cfa516f96a8bcd17ec6b3e2ec0e7fca8c98b613
 2022-02-14 16:29:14 +00:00
Beverly
f53f2ad864 Remove toast window token after being rate-limited 
Test: manual, atest NotificationManagerServiceTest
Fixes: 211005909
Change-Id: I2375b72cb60ee535dcb78aa0d064455c5247b4f6
(cherry picked from commit 2a35959ecd)
 2022-02-14 16:29:06 +00:00
Treehugger Robot
232508395e Merge "Add OWNERS entries for Android time team" am: 5ec4a12947 am: 2187630b81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984967

Change-Id: I66ca05bc759163ee12a10b2adad67f7b5300008b
 2022-02-14 15:36:47 +00:00
Treehugger Robot
2187630b81 Merge "Add OWNERS entries for Android time team" am: 5ec4a12947 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984967

Change-Id: Ic8abddc91831b4f69b591b63de6680ffa56bc285
 2022-02-14 15:19:08 +00:00
Treehugger Robot
5ec4a12947 Merge "Add OWNERS entries for Android time team" 2022-02-14 15:01:49 +00:00
Treehugger Robot
76665a6498 Merge "Add null check after getApplicationInfo in InstantAppNotifier" am: 56d6691e8e am: f5d40d9afa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890539

Change-Id: If2b940c67264da914200d4dba6bc188134ad7733
 2022-02-14 14:37:33 +00:00
Treehugger Robot
f5d40d9afa Merge "Add null check after getApplicationInfo in InstantAppNotifier" am: 56d6691e8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890539

Change-Id: Ic3c9ba54dce4ebf5a00e901e6fdf1bf701301810
 2022-02-14 14:18:49 +00:00
Treehugger Robot
56d6691e8e Merge "Add null check after getApplicationInfo in InstantAppNotifier" 2022-02-14 14:04:08 +00:00
Nicolas Geoffray
21e85559f4 Merge "Call the right JNI helper." am: e032bc4139 am: a029521318 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984966

Change-Id: I89ef86a02751c9f591b725c9a693cca6bd44f225
 2022-02-14 12:43:56 +00:00
Artur Satayev
c8d4c8faf8 Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." am: 19c5ee8bf1 am: 247988066c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978331

Change-Id: Ifb3aec2d1e7aeb5aa24b6d1bf70ba6cd4fa987ed
 2022-02-14 12:43:40 +00:00
Nicolas Geoffray
a029521318 Merge "Call the right JNI helper." am: e032bc4139 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984966

Change-Id: I23c51a4c7c7372b9aa6fadc4c979b8e6ee7d6b4a
 2022-02-14 12:25:46 +00:00
Artur Satayev
247988066c Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." am: 19c5ee8bf1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978331

Change-Id: I2e79f4e4a522d25309d27cc85e4164422b47a219
 2022-02-14 12:25:22 +00:00
Nicolas Geoffray
e032bc4139 Merge "Call the right JNI helper." 2022-02-14 12:17:37 +00:00
Artur Satayev
19c5ee8bf1 Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." 2022-02-14 12:08:04 +00:00
Neil Fuller
e41149620d Add OWNERS entries for Android time team 
Add entries for the files that the Android time team have to update
occasionally.

Bug: 218802673
Test: None
Change-Id: I1255ac04e91c37051bdf4f72acea5cae4aca99db
 2022-02-14 10:17:34 +00:00
Ahaan Ugale
ff6ec88858 OWNERS for widget coretests 
Change-Id: Ie0c71086d002f21c4cbe8758cb151e73d439d446
 2022-02-14 10:02:25 +00:00
Treehugger Robot
9432472262 Merge "Add a benchmark test for Resources.getIdentifier" am: 49665e8d49 am: 863e8c2eaa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934472

Change-Id: Ia5b7dec81c5e1fa6f79d0ef3a5bfb7cec3f59ae7
 2022-02-14 09:04:50 +00:00