Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Baumann
20171d27de [automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours am: 15a769dbc3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6ec80d705bfa7d0f2039187ba2b7544c5cd1a68
 2020-08-29 01:12:11 +00:00
John Reck
ffe95e0b1b [automerger skipped] Merge "Add missing isShellUser check" into pi-dev am: 85828e5c49 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I95c285335e58589b86928b45c9dae6e1d67f49e6
 2020-08-29 01:12:02 +00:00
TreeHugger Robot
e8e4ec86a0 [automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 am: ef301aba3e -s ours am: 09b011ffca -s ours am: 53db65ef90 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Ice7861808d4dc94df2d352e12b18964f70ae2348
 2020-08-29 01:11:50 +00:00
TreeHugger Robot
2f744694aa [automerger skipped] Merge "Add missing isShellUser check" into oc-mr1-dev am: 0fb5377eb5 am: f1a3a1e736 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I2c4c36d98cdaca92a470c5c889c15deabbecdc1e
 2020-08-29 01:11:34 +00:00
TreeHugger Robot
bba7925676 [automerger skipped] Merge "Remove unused intent in NiNotification" into pi-dev am: 095a00f2ca -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 8b7811ce59 is in history

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

Change-Id: I7742bdc50690cb0e1bb69c54d0d56d8fe13155e9
 2020-08-29 01:11:18 +00:00
TreeHugger Robot
ae5926a8b0 [automerger skipped] Merge "Remove unused intent in NiNotification" into oc-mr1-dev am: 03ea7aa96a -s ours am: b321e8fa08 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 2b313d61ae is in history

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

Change-Id: Icc05f9d1ab0af15d36c06e02d3c589a95a77190c
 2020-08-29 01:11:01 +00:00
Yu-Han Yang
90509fe850 [automerger skipped] Remove unused intent in NiNotification am: ef5279d9f5 am: f6a8668ade am: 0158fc6535 am: 11781218c2 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 2b313d61ae is in history

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

Change-Id: I4e7430d9f7608a5a2d4c70d8a24e9b2bbf71a50d
 2020-08-29 01:10:47 +00:00
Lucas Dupin
1d9d0f28e2 [automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b06 -s ours 
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history

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

Change-Id: I1f6df7d93e70227c9e02773b4a4035c743f6f4e3
 2020-08-29 01:10:27 +00:00
Hai Zhang
ea36a0c236 DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a30457 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366889

Change-Id: Iab47aca559ae8c13a26507827aadfc0c8b239d74
 2020-08-29 01:09:22 +00:00
Treehugger Robot
72eda1bb48 Merge "[BugFix][Fingerprint]fix client was canceled by service by mistake" 2020-08-29 01:05:18 +00:00
TreeHugger Robot
7c97d21a84 Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into rvc-dev 2020-08-29 00:57:23 +00:00
TreeHugger Robot
eafc07a70a Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into qt-dev 2020-08-29 00:57:07 +00:00
Kevin Chyn
365df3bd34 [BugFix][Fingerprint]fix client was canceled by service by mistake am: 16aa67ef5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484242

Change-Id: I1228bf95900a21273664485f24171250e59929a8
 2020-08-29 00:37:36 +00:00
Kevin Chyn
16aa67ef5e [BugFix][Fingerprint]fix client was canceled by service by mistake 
issue:
After the call of client A started in the lockout state returns,
after client B calls the fp service, A is dead,
a death notification will be sent to the service, and the service will stop clent B.

solution:
Each time onAuthentication sets a flag mAlreadyDone to true.
Judge this flag as true in binderDie, and keep the current
fingerprint operation to avoid affecting the current user

Signed-off-by: zhangyupeng1 <zhangyupeng1@xiaomi.com>
Change-Id: I56ce99505febbb48dc13ccfc3c2d120123da4fa3
Merged-In: I56ce99505febbb48dc13ccfc3c2d120123da4fa3
 2020-08-28 15:56:32 -07:00
zhangyupeng1
ed1c9cae12 [BugFix][Fingerprint]fix client was canceled by service by mistake 
issue:
After the call of client A started in the lockout state returns,
after client B calls the fp service, A is dead,
a death notification will be sent to the service, and the service will stop clent B.

solution:
Each time onAuthentication sets a flag mAlreadyDone to true.
Judge this flag as true in binderDie, and keep the current
fingerprint operation to avoid affecting the current user

Signed-off-by: zhangyupeng1 <zhangyupeng1@xiaomi.com>
Change-Id: I56ce99505febbb48dc13ccfc3c2d120123da4fa3
Merged-In: I56ce99505febbb48dc13ccfc3c2d120123da4fa3
 2020-08-28 20:22:29 +00:00
Grace Jia
e29957512c Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 am: 618efc989b am: 61c321f4fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1414388

Change-Id: If398a3b89bb6c11487d8ac2844bbf09cfb18b2b7
 2020-08-28 16:56:14 +00:00
Grace Jia
61c321f4fb Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 am: 618efc989b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1414388

Change-Id: Ib4db14d7344f84383decf914fbeedf3c69384875
 2020-08-28 16:29:30 +00:00
Grace Jia
618efc989b Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1414388

Change-Id: I9cc83b4b9c121f633710486e849edd036f698ff7
 2020-08-28 16:14:17 +00:00
Treehugger Robot
32b5a2caae Merge "Implement powerOnRemoteDevice method" am: b2a61f7c31 am: df5e8a909c am: 95e7e55319 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396413

Change-Id: Icb2fba4cb47718a02f3720f4d351f297d8faf5dd
 2020-08-28 16:05:08 +00:00
Grace Jia
bd03ae8b86 Merge "Allow empty tokens in strict grammar" 2020-08-28 15:37:00 +00:00
Treehugger Robot
95e7e55319 Merge "Implement powerOnRemoteDevice method" am: b2a61f7c31 am: df5e8a909c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396413

Change-Id: Ia3bce5bbb006b1ea4a4de3a9e6379798f8d9596c
 2020-08-28 15:31:12 +00:00
Treehugger Robot
df5e8a909c Merge "Implement powerOnRemoteDevice method" am: b2a61f7c31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396413

Change-Id: I1440f7bff9e50ad4ca4a933e59849c404b5d1855
 2020-08-28 15:00:12 +00:00
Treehugger Robot
b2a61f7c31 Merge "Implement powerOnRemoteDevice method" 2020-08-28 14:47:53 +00:00
Junyu Lai
4295a632b4 Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 am: b5e1feccbe am: 09ab7ad386 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: I846ad59dba08f17a01700378a2cdbb931629b283
 2020-08-28 11:45:51 +00:00
Junyu Lai
09ab7ad386 Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 am: b5e1feccbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2
 2020-08-28 11:09:43 +00:00
Junyu Lai
b5e1feccbe Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: I3fc55eee7781dff7bf6f859c9ef229bf4fbc7323
 2020-08-28 10:36:22 +00:00
Junyu Lai
6d7c1854a8 Merge "Notify the keepalive is stopped after the slot has been released" 2020-08-28 10:12:44 +00:00
TreeHugger Robot
7cab297dc3 Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12377822

Change-Id: I3166339d7a05ad7626f7f471960fbb2522bbb44e
 2020-08-28 01:49:42 +00:00
TreeHugger Robot
2555567ca2 Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp 2020-08-28 01:38:59 +00:00
Patrick Baumann
98eb87b770 [automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 am: bf7499c1b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446

Change-Id: I1ca97397870706cd0ab02aff97c05359db352905
 2020-08-28 01:13:48 +00:00
Automerger Merge Worker
dc13f55d1e Merge "Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 am: e424e3c30e" into rvc-d1-dev-plus-aosp 2020-08-28 01:13:16 +00:00
Winson Chiu
e0112815ec Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 am: e424e3c30e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043

Change-Id: If0ee2746481e301529b0b30aa7a70744c5b23ea0
 2020-08-28 01:13:09 +00:00
Patrick Baumann
ba7275698e [automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 am: 938fb7e821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446

Change-Id: Ic24f8944c1a55af4be69ce86fd9e65818f83ef2f
 2020-08-28 01:13:05 +00:00
Automerger Merge Worker
6811659f34 Merge changes from topic "am-4f55cf354ee849c8a9efbca3e14ade7f" into rvc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: b58f9a217e -s ours
  [automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 1e2ed9cad0 -s ours
 2020-08-28 01:13:00 +00:00
Chris Tate
ab16634e37 [automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: b58f9a217e -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I38c6dff323986cc2c1c2c8b0e908532b82af37b0
 2020-08-28 01:12:55 +00:00
Christopher Tate
383badd497 [automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 1e2ed9cad0 -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I4c354db78210b06284282352c1ed3f52fc323617
 2020-08-28 01:12:52 +00:00
Winson Chiu
c82f925bbf Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 am: 3ac67663e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043

Change-Id: I66c2528927efd1ab1831e06d61744cdd8d01adb7
 2020-08-28 01:12:50 +00:00
Chris Tate
ccef42f2ab [automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81 am: 42c911a8d8 -s ours am: c9c3789db6 -s ours am: f9920fdcee -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I2f5ee308fc9480599ebb3366232870ad2f153879
 2020-08-28 01:12:38 +00:00
Automerger Merge Worker
b4d48ef86f Merge changes from topic "am-6f770425941c4b038ea830d1a049926f" into rvc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: 9cb0c58fb0 -s ours
  [automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 12dc02e15b -s ours
 2020-08-28 01:12:36 +00:00
Chris Tate
4e57d56e2a [automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: 9cb0c58fb0 -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: Ica137367dd7e6c1c0b7a311262128d7c3e544b47
 2020-08-28 01:12:30 +00:00
Chris Tate
aad1e8d73c [automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b am: 3f92d05734 -s ours am: b722c3b36d -s ours am: 1e8c7faa55 -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I10d6f1aa81805f1294a53d39e8926e14c5c7b20f
 2020-08-28 01:12:13 +00:00
Christopher Tate
bab985e7d3 [automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 12dc02e15b -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I0edafcfc6092d9c595cf4e0f1680ef3248f1384d
 2020-08-28 01:12:13 +00:00
Chris Tate
bd38fd22d3 [automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81 am: 42c911a8d8 -s ours am: c9c3789db6 -s ours am: 26a8265584 -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I8e1d324c3b6b8f7a45295230fd98d3373bea0d2e
 2020-08-28 01:11:50 +00:00
Chris Tate
bec7418c3a [automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b am: 3f92d05734 -s ours am: b722c3b36d -s ours am: 0bba18e675 -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: If14edc2d95a7fb004397999b56991fe107008c12
 2020-08-28 01:11:25 +00:00
Hall Liu
256c414bbb Allow empty tokens in strict grammar 
Allow empty tokens in SQLiteQueryBuilder's strict grammar enforcement

Bug: 143230980
Test: atest SQLiteQueryBuilderTest, manual
Change-Id: Ie82dded77a3eaa75095333b0e77f10e21c9f7caf
Merged-In: Ie82dded77a3eaa75095333b0e77f10e21c9f7caf
 2020-08-28 00:28:53 +00:00
Patrick Baumann
bf7499c1b1 [automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446

Change-Id: I184b46b4b02f370e51fa3b1f8043731a9888ba11
 2020-08-28 00:20:45 +00:00
Winson Chiu
e424e3c30e Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043

Change-Id: I5a9521522be384ba5f50ab4ef346c8b2aa1775e0
 2020-08-28 00:20:33 +00:00
Patrick Baumann
938fb7e821 [automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446

Change-Id: If6d03720e2e7b367917e68632edad2f9ef9276a6
 2020-08-28 00:20:32 +00:00
Winson Chiu
3ac67663e0 Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043

Change-Id: I3535804b5c384782c5d4cca82d433f617accb7ce
 2020-08-28 00:20:21 +00:00
Chris Tate
b58f9a217e [automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours 
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I5795ae998fc3242ad7cf35abb01722fec7a6c7ae
 2020-08-28 00:20:17 +00:00