Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2bc5bbf304 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours am: 2795524cc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e4a279bf2a03fb545f335f8b70171b9e35d9222
 2021-08-13 23:50:02 +00:00
TreeHugger Robot
0537491a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours am: db20a16c5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a0ce09ff7a262c3c72cb950e13d06c9ce40edfc
 2021-08-13 23:49:02 +00:00
Bill Yi
680e13f294 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:48:13 +00:00
Bill Yi
41c6386507 Merge changes from topic "presubmit-am-4f2f6883d74b4b26ac21b30841644c64" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ef466173ff
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 23:48:13 +00:00
Bill Yi
a74d94dde7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:46:35 +00:00
Bill Yi
def69fa19c Merge changes from topic "presubmit-am-05c1ffc57ea7472e8f99038bc0424cc2" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5338485ad1
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 23:46:35 +00:00
Bill Yi
93fa3accad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours am: 05a3ee414f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71c89a17de6d8f71da8c2785bc62debdfc86408e
 2021-08-13 23:30:22 +00:00
TreeHugger Robot
43cd3c6c18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours am: 41d0e54a5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I555bbe22a698d904a0ff1eaba9c824e3857088f6
 2021-08-13 23:30:15 +00:00
Bill Yi
2795524cc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3f20c30df8c7330be878a8adc5f15c36cc11fac
 2021-08-13 23:25:26 +00:00
TreeHugger Robot
db20a16c5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa01ce9ceb5bf13bc23561632edae8ced92d9994
 2021-08-13 23:24:58 +00:00
Bill Yi
05a3ee414f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1f42dec69d1d858d9dc1370e3b1342039092741
 2021-08-13 23:24:16 +00:00
TreeHugger Robot
41d0e54a5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc070852c5d550a99c8be3d5d05d42400eb7f545
 2021-08-13 23:23:54 +00:00
Bill Yi
10faec1792 Merge changes from topic "presubmit-am-a06acefa6477490ebb2f9621b57cedf9" into sc-dev-plus-aosp am: df8a438396 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544165

Change-Id: I91d4aef3cfa89e453d88f0fd29866fb007056c7c
 2021-08-13 23:19:41 +00:00
Bill Yi
10978d402c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2984e28472 am: f8eab529c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72525b5ec97296f3bd57788a8cdcdc00aabf8598
 2021-08-13 23:19:32 +00:00
Bill Yi
6481a5c3d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours am: f03061b704 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdee38cf30fa72c00bd71cf64da2901def16cf09
 2021-08-13 23:18:52 +00:00
Bill Yi
eba4506460 Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp am: b701023fc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544444

Change-Id: I2be82a25a53e3b3e641b7c64c839bf321d1a2a0c
 2021-08-13 23:18:44 +00:00
Bill Yi
1f85f9448c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 523e8000f9 am: 3b8a970410 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4a0cf1a30a5c86cb6eb48e1bb478511df030506
 2021-08-13 23:18:31 +00:00
Automerger Merge Worker
797489f58d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: a4712801b4 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-13 23:18:21 +00:00
Automerger Merge Worker
e83409a8b0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours am: e4c51ab8fd -s ours" into sc-qpr1-dev-plus-aosp 2021-08-13 23:18:07 +00:00
TreeHugger Robot
c38b38ba90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: a4712801b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f2db1232f3ad65387e42b51a9c4891afb2785c2
 2021-08-13 23:17:52 +00:00
Bill Yi
85da37d8a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours am: e4c51ab8fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bde2049aadf55c8a4167b3b4b41a3f9f19552c1
 2021-08-13 23:17:49 +00:00
TreeHugger Robot
fa756b6318 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours am: 89e9e36295 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2be8ca4528568309964eea923808265275b7fc3d
 2021-08-13 23:17:38 +00:00
TreeHugger Robot
d62adfcfc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours am: c6077c7291 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ed70414d86e7cc5cdddd17f90575bb9eba430c0
 2021-08-13 23:17:07 +00:00
Bill Yi
e71c41a882 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:15:02 +00:00
Bill Yi
df8a438396 Merge changes from topic "presubmit-am-a06acefa6477490ebb2f9621b57cedf9" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2984e28472
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 23:15:02 +00:00
TreeHugger Robot
69d06e9fb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f3de0722f388d17aaea46acbe7c382eff226659
 2021-08-13 23:11:50 +00:00
Bill Yi
e4c51ab8fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id400594f2ba97ed4ee018b1085829d2df7ccc79e
 2021-08-13 23:06:59 +00:00
Bill Yi
f03061b704 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf328fc9fd8e99f9e6e5ea77c6d5b5faa90e89cf
 2021-08-13 23:05:55 +00:00
Joe Bolinger
5d5d9eb812 Add a generic error message for missing vendor error strings. 
The message is empty, instead of null, to prevent apps from crashing but it will be changed to a more meaninful string in a future change.

Fix: 196176475
Test: N/A
Change-Id: I7823084238a87cb1b8892b8550c472cd8b40f556
 2021-08-13 16:03:54 -07:00
TreeHugger Robot
334b3f71c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: 403f941afb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1be2478a2f60c65fe4f6fc02cd9b73fc45c2a6e7
 2021-08-13 23:03:45 +00:00
TreeHugger Robot
52a4e399f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours am: 6dcacb9ba2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id94fd106d26485bd3baae8bbcacb33c43af049e4
 2021-08-13 23:03:39 +00:00
TreeHugger Robot
95fce407ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours am: 7140b47d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc2b684fe9479e084279eb15c46f7d8ebe921333
 2021-08-13 23:03:29 +00:00
TreeHugger Robot
6b8bfbb427 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours am: dba5e43aeb -s ours am: ddcdda9f4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bb55d8f3145624878078df0fd72e92580980873
 2021-08-13 23:03:19 +00:00
Myles Watson
c4b27dfce3 Allow SHELL_UID to disable Bluetooth for testing 
Bug: 189952422
Test: atest VtsHalBluetoothV1_0TargetTest
Change-Id: Id45a43b824b2be49fb38686f9582484931024187
 2021-08-13 16:03:12 -07:00
Bill Yi
b701023fc0 Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 523e8000f9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 23:03:10 +00:00
Bill Yi
da46d42b87 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:03:10 +00:00
TreeHugger Robot
72e90cdbc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours am: 7eba26bb3f -s ours am: 17e594d97f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I073e4679c0c51cf0b298eced7d7d0abda688b645
 2021-08-13 23:02:59 +00:00
Automerger Merge Worker
c26fee3874 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev am: 3c65d955f6 -s ours am: ad89024ebb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4e1739dbe8a922e88feeea0bcbae0bf3879dd56
 2021-08-13 23:02:46 +00:00
Max Bires
cc249282eb Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921 am: c03dc8059e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584

Change-Id: I881526065de0b69ba2ed9042dba79de846a6042e
 2021-08-13 23:02:09 +00:00
TreeHugger Robot
403f941afb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91d987a7a9f2753e8e51fb1ba69588e01fe3de47
 2021-08-13 23:01:43 +00:00
TreeHugger Robot
6dcacb9ba2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If22f44722a0d7e2c74870fdc3c1e1de168bb0168
 2021-08-13 23:01:40 +00:00
TreeHugger Robot
076d7baa18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 035381f8e4 -s ours am: 93800f9c89 -s ours am: 8be08091b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6ffe253342f665e6795c242eee2f2c85639ea28
 2021-08-13 23:01:35 +00:00
TreeHugger Robot
7140b47d4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I904380032352ea9f5ba0fea6a8e6025b6f8db6d5
 2021-08-13 23:01:30 +00:00
TreeHugger Robot
a4712801b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf5beb9ee197a25a30228bac653b5dd7fe3f6c93
 2021-08-13 23:00:55 +00:00
TreeHugger Robot
89e9e36295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7044de061d3482c3968dfe337352c5a23fd59df
 2021-08-13 23:00:37 +00:00
TreeHugger Robot
c6077c7291 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d9233a75ec82c59cf654aaad72fa475682d7ed4
 2021-08-13 23:00:16 +00:00
TreeHugger Robot
62283a9082 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours am: dba5e43aeb -s ours am: c488eeef43 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ee4759cdc2dd6756e588e536eb669a32aa3c9a8
 2021-08-13 22:56:39 +00:00
TreeHugger Robot
46924802f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours am: 7eba26bb3f -s ours am: 17e5c43103 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae0679d991b498cf368f5a8db824ef71238a772f
 2021-08-13 22:56:21 +00:00
Automerger Merge Worker
bd4db24d43 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev am: 3c65d955f6 -s ours am: 0e6246c3c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9d12bafd47c666f472496b93198bc1958225af7
 2021-08-13 22:56:06 +00:00
Max Bires
88ee46285a Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921 am: d3d4714d27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584

Change-Id: I2a572c42b608f45b1928b2f2d3a1176dbfbf9b79
 2021-08-13 22:55:37 +00:00