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

564455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
7cd99c47bb resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
 2021-01-31 00:40:24 +01:00
Jakub Pawlowski
132a502721 Merge changes Iec48eba9,I4358aac8 am: a0c7f5115f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ae6b5d81dd7b51e2cea76de2619c997cebd147
 2021-01-30 16:27:51 +00:00
Jakub Pawlowski
a0c7f5115f Merge changes Iec48eba9,I4358aac8 
* changes:
  docs: fix typo HDP->HFP in BluetoothHeadset
  docs: Use correct profile for intent
 2021-01-30 15:29:21 +00:00
Muhammad Qureshi
278b741e3a Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def am: e3b7b329c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie81d4767c721674124bf7e4b00778c85f67440da
 2021-01-30 03:59:49 +00:00
Muhammad Qureshi
2e7b3476cf [automerger skipped] [RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f am: 60b00ec30f -s ours 
am skip reason: skipped by user muhammadq

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86e796e3caa7be0d362ca08de4a2887dfb77c68c
 2021-01-30 03:59:37 +00:00
Treehugger Robot
71375c86d8 Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id05953c7bdb08255d248b5f755d262dfa8098af5
 2021-01-30 02:52:14 +00:00
Treehugger Robot
7ebd138270 Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88745f4ab8a6d249678167a5cb4010aaa9568e01
 2021-01-30 02:39:36 +00:00
Tomasz Wasilczyk
12824746c7 Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0 am: 9768739095 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554929

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc56ca2a3d933b34b125719a6492477e05695694
 2021-01-30 02:31:28 +00:00
Muhammad Qureshi
e3b7b329c9 Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44049f158a5aa39049ba1bf0443b70de6679527d
 2021-01-30 02:30:15 +00:00
Kevin Han
9785e97602 Merge "Introduce global package hibernation" am: 6857f6ed91 am: 95244bedc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I780c3f8d4d3288d77f479a93c3ea41ad052dc4bd
 2021-01-30 02:30:14 +00:00
Muhammad Qureshi
60b00ec30f [RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1da4a9159e5611d80c618913f728defb5399d927
 2021-01-30 02:30:06 +00:00
Tomasz Wasilczyk
9768739095 Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554929

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7551b1ce3883e85c0da8376424aeb9814a8832be
 2021-01-30 02:17:19 +00:00
Elliott Hughes
b6dd5e5fb5 Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb1e8c7f8ba5c99b7f33b65c130f9ec3d0fb6498
 2021-01-30 02:15:16 +00:00
Junyu Lai
c1f916005f Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac04c am: 31522e92b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9254d74b8cbc28d652a88f35ead8007cc0336bf1
 2021-01-30 02:15:02 +00:00
Kevin Han
95244bedc7 Merge "Introduce global package hibernation" am: 6857f6ed91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb2e666ad166fba7c59c75d1428082aa9f2a6da5
 2021-01-30 02:11:17 +00:00
Elliott Hughes
159155defe Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6baddda3f36366349a7c67f13a043adeb83a089e
 2021-01-30 02:05:59 +00:00
Julius D'souza
41ae1dc0c0 Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d2f am: 3a91a2fdc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c028f67530264700d885f7b272f345ba6770a58
 2021-01-30 02:01:04 +00:00
Muhammad Qureshi
0992a32def Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev 2021-01-30 02:00:56 +00:00
Junyu Lai
31522e92b4 Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac04c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If92b70b62029571082bba8e823d115cee2860a8d
 2021-01-30 02:00:20 +00:00
Treehugger Robot
193dfa0a19 Merge "add shell user permissions for Asistant GTS tests" 2021-01-30 01:53:58 +00:00
Julius D'souza
3a91a2fdc2 Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439c953289b02c25a727d3f6c984b20eaae4b24c
 2021-01-30 01:25:40 +00:00
TreeHugger Robot
ce3ba7e22d [automerger skipped] Merge "Only update native InputApplicationHandle once" into rvc-dev am: 274863f9d5 am: 536ca6cad7 -s ours 
am skip reason: Change-Id I70de9835c7699fe6f56fc3655b0fee5c317ecc3a with SHA-1 c26a04ce1a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54c8fd0f240b1c73cc6730412fff98dfbe83e261
 2021-01-30 01:22:44 +00:00
TreeHugger Robot
536ca6cad7 Merge "Only update native InputApplicationHandle once" into rvc-dev am: 274863f9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210344

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cad950c1c9320b5bce2f030896a4c33ec9b657a
 2021-01-30 01:01:00 +00:00
Tomasz Wasilczyk
13466883b0 Merge "Fix initialization of USER_ROTATION setting." 2021-01-30 00:55:53 +00:00
Kevin Han
6857f6ed91 Merge "Introduce global package hibernation" 2021-01-30 00:37:19 +00:00
Nicholas Ambur
57969acf86 add shell user permissions for Asistant GTS tests 
Bug: 177271291
Test: gts-tradefed run gts -m GtsAssistIntentTestCases
Change-Id: I6c6134a9912a73039556a4d700bbb0bb97b6b3d4
Merged-In: I293d66811f8a27170f2bc4cb74b7d4c9ec55fac8
 2021-01-29 16:28:19 -08:00
Elliott Hughes
1528efe4b1 Merge "Remove __ANDROID_API__ #if checks." 2021-01-30 00:15:18 +00:00
Varun Shah
9d58180bfa Merge "Fixed to prevent usagestats file corruption when writing" am: 98fc96fc65 am: acb36aadda 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6bf40e6f362f9153cc5331e42af33b814e988d4
 2021-01-30 00:06:45 +00:00
TreeHugger Robot
274863f9d5 Merge "Only update native InputApplicationHandle once" into rvc-dev 2021-01-30 00:06:35 +00:00
Steven Moreland
40b8fc37d4 Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406 am: ac37ade768 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf6029ca6457bd3531b66dd816346ec69a533c5f
 2021-01-29 23:53:23 +00:00
Tianjie Xu
e3100d7111 Merge "Fixes how unbindService works" am: b7682d401f am: 3339f21560 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11a8539250d062b72f22e4c547fb80634c77f188
 2021-01-29 23:52:59 +00:00
Leon Scroggins
728df04abb Merge "Apply bilinear filter for Ninepatch." am: 59e8bb9e98 am: 8e3cdfb050 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic935b67812261d72717e61e958c011f307e93638
 2021-01-29 23:52:00 +00:00
Varun Shah
acb36aadda Merge "Fixed to prevent usagestats file corruption when writing" am: 98fc96fc65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8cff49d1ea647f0a2ec16ba3eed7a4f54c091d1
 2021-01-29 23:51:26 +00:00
Steven Moreland
ac37ade768 Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fa34ec1480e4ea584b4e5dc5c528d4168120d26
 2021-01-29 23:44:22 +00:00
Amit Mahajan
7cc0399bed Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9d6 am: 56efb4fa2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2cd8eaede2cee87887aaab12329b2f9ae60fd73
 2021-01-29 23:43:58 +00:00
Tianjie Xu
3339f21560 Merge "Fixes how unbindService works" am: b7682d401f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16e115505e4b3c2ac0c9fe78e82b704cb1ce4ceb
 2021-01-29 23:31:30 +00:00
Leon Scroggins
8e3cdfb050 Merge "Apply bilinear filter for Ninepatch." am: 59e8bb9e98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2bd4a061e3f18f43eff091c3bfb858fee2f0d80
 2021-01-29 23:28:11 +00:00
Amit Mahajan
56efb4fa2b Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4413bf936d1cc129b3b14442cd91bced306c7c1
 2021-01-29 23:24:35 +00:00
Etan Cohen
59f5bcf834 Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e am: af364469e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9987a2c2a98bff2e29cad4624b73bde0c37278dd
 2021-01-29 23:23:13 +00:00
Cody Kesting
46309401db Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf50bd8bba996b9bbbb4d77e1bac997fc95fbb10
 2021-01-29 23:22:47 +00:00
Junyu Lai
22745a5c44 Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765d2 am: 1800e22426 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcaddb813f501065921e55b6e8a33269c1f4f95f
 2021-01-29 23:22:35 +00:00
Treehugger Robot
c352f6cded Merge "add ownership" am: c63817d8f0 am: b327283c1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I843daa05b152bc2fdd2b51f6e7038df98a54e3d6
 2021-01-29 23:22:13 +00:00
Junyu Lai
9e10a5a1ef Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: 0824b59f74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idee0985fa0feb2c3fd572c66c12a4ee5f0e236e7
 2021-01-29 23:21:49 +00:00
Naomi Musgrave
2486ee1320 Merge "Introduce OWNERS file for Display unit tests" am: a1721e71ca am: a0fcc520c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563732

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd6c5d56cb4bbbe8fc4728409604ff3f1c018284
 2021-01-29 23:21:17 +00:00
Junyu Lai
5ad75875bf Merge "[VCN06] Support request background network" am: 7e0d8315d1 am: 5fa77ae82c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c41f6e2eda3b0b690cf6715c58f3bb98de8b1c1
 2021-01-29 23:21:03 +00:00
Lucas Lin
ef5f51a45b Merge "Remove unused method from MatchAllNetworkSpecifier" am: 6a5d57c2ee am: 2de61be98e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120c364d877a6dd472197004a6a13740f743da9
 2021-01-29 23:20:33 +00:00
Treehugger Robot
c0ca5d9c48 Merge "Add stange@ to the list of ContextHub owners" am: ac165ae86d am: ad0b5aac70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cb0ee144d45045b4f3dd16b5a411bf7a6aafb6a
 2021-01-29 23:19:48 +00:00
Junyu Lai
ac0dbac04c Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" 2021-01-29 23:15:32 +00:00
Etan Cohen
af364469e5 Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf4c8e505f9ea5db7d8581b90825baef5624e9dc
 2021-01-29 23:14:45 +00:00
Cody Kesting
89a75849c2 Merge "Allow system components to request underlying network policies." am: ba04ef8481 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cdd1d5624d1f41cd80b6353466af49d5e59a81b
 2021-01-29 23:10:36 +00:00