Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
497,665 Commits 3 Branches 0 Tags
b51058da225d452f2a248b6be6a945e86417b7e6
Commit Graph

497665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b51058da22 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8b967ecb544aa886302eb4a13f0542464ee1608
 2021-03-12 00:38:07 -08:00
Antonio Kantek
61e7956648 Merge "Use futures for binding and talking to the ExternalStorageService." into rvc-qpr-dev 2021-03-10 21:16:43 +00:00
Miranda Kephart
8d8067af60 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours am: c202b0836a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47a8cf7169b2c60af89b898c446086d8ed7a2d8c
 2021-03-10 21:15:02 +00:00
Miranda Kephart
8487e20527 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 am: 46ecf995d7 -s ours am: 55255a5a1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6745957fd6ee937027fb946e43ccdf7b7aaaf423
 2021-03-10 21:14:40 +00:00
Miranda Kephart
dfa0e0a7fd [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 am: 1c0fa75c03 -s ours am: 8d2a5195e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If00e95a9bd4c4b18a93180be948946b782b0baaa
 2021-03-10 21:14:18 +00:00
Miranda Kephart
26c342dd01 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours am: e46f0812c6 -s ours am: a53e25c4c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96d2a64a430b2422699b83595942a468e568a5d5
 2021-03-10 21:14:09 +00:00
Miranda Kephart
c202b0836a [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie819e8cfd7d5101c7e86f0e9c871c71bae453856
 2021-03-10 20:33:51 +00:00
Miranda Kephart
55255a5a1d [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 am: 46ecf995d7 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15020d4303fa78f01395e88ded1d1c18496310b9
 2021-03-10 20:33:31 +00:00
Miranda Kephart
8d2a5195e2 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 am: 1c0fa75c03 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie32197ff743b6ea550c2386b06d6e6e855155982
 2021-03-10 20:32:50 +00:00
Miranda Kephart
a53e25c4c4 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours am: e46f0812c6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I955754f0c35642791c205dfe229cbebcc37a85c5
 2021-03-10 20:32:37 +00:00
Miranda Kephart
91175a30c6 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfc60f4d303c8443cb22f25a8ae7eebbba672094
 2021-03-10 19:55:04 +00:00
Miranda Kephart
46ecf995d7 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce3345d347fc746e99012b48a53f7baff608a18
 2021-03-10 19:54:49 +00:00
Miranda Kephart
1c0fa75c03 Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad70261e338ed3b04b69c48f12ecdc664bfe0056
 2021-03-10 19:54:27 +00:00
Miranda Kephart
e46f0812c6 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours 
am skip reason: skipped by user mkephart

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcae7f5fe087582ef0aa546e33eeafdb25b0b87c
 2021-03-10 19:54:21 +00:00
Youngjun Kwak
ed260d837f Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev 2021-03-09 18:19:26 +00:00
kwaky
b700beab66 DO NOT MERGE Do not reinflate the layout if it has not been already inflated. 
This fixes the NPE caused when reinflate method is called before the
layout is inflated.

Bug: 180534861
Test: Manual
Change-Id: Ia3fb6867e55c63a5fe7c17df1c3f86d048b4d1a8
 2021-03-08 10:48:05 -08:00
TreeHugger Robot
84da0714a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-08 17:24:57 +00:00
Martijn Coenen
031e607a5a Use futures for binding and talking to the ExternalStorageService. 
Patching this CL since it fixes the issue of screen freezing after switching user.

The existing CountdownLatch logic had some corner cases where it would
continue waiting for the latch to count down, even when it was already
clear that the operation couldn't succeed (eg, a bind failed).

To fix this, as well as try and simplify some of this code, switch to
using futures, which have a nicely defined way of cancelling outstanding
operations.

Additionally, switch to using a dedicated handler thread for receiving
bind events for all users, not just demo users. This avoids having to
wait for a long time when the system_server main thread is busy.

Fix: 180930791
Test: atest AdoptableHostTest
      atest CtsScopedStorageHostTest
      atest android.multiuser.UserLifecycleTests#managedProfileUnlock
      atest android.multiuser.UserLifecycleTests#managedProfileUnlockAndLaunchApp_stopped

Change-Id: Id58970106d152e5d200cfd3993fd83b93b975156
Merged-In: I1b7fde2f6ed1074b9c814d56808ab1614f25aead
(cherry picked from commit 9252dfb493)
 2021-03-08 10:25:36 +00:00
Bill Yi
8fc8c017f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1e4528f615372f2cfbbcfd068a9c31fd5bdd7157
 2021-03-08 08:33:51 +00:00
TreeHugger Robot
1a3bc30fcd Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-07 18:43:24 +00:00
Bill Yi
00a59e27cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7fef91b6575f26e635bdcfa0eeef688cf64ac04c
 2021-03-07 14:26:31 +00:00
TreeHugger Robot
e954e6a5b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-06 07:56:37 +00:00
Bill Yi
4300a836e8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0d82243b8456ec67b6e96381dff6231d6b1a845f
 2021-03-06 06:03:48 +00:00
Youngjun Kwak
b20f69a4cc Merge "Move posting logic from PerDisplay to DisplayWIndowInsetsControllerImpl." into rvc-qpr-dev 2021-03-05 22:39:32 +00:00
Danny Epstein
43c4add74a Merge "Configure privapp perms for rotary service" into rvc-qpr-dev 2021-03-05 21:14:22 +00:00
kwaky
3cc2f503bf Move posting logic from PerDisplay to DisplayWIndowInsetsControllerImpl. 
Partial backport of I9a354f742167b907c32537eb022e22c0d5bfb97a.

Bug: 178071393
Test: Manual & Existing Unit Tests
Merged-In: I9a354f742167b907c32537eb022e22c0d5bfb97a

Change-Id: Ie8210170776d1a5a3b736b6d43989cc59ba30f48
 2021-03-05 12:44:46 -08:00
TreeHugger Robot
91568eb50e Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev 2021-03-05 17:10:19 +00:00
Heemin Seog
53107b6e79 Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev 2021-03-05 16:47:48 +00:00
TreeHugger Robot
6babba7950 Merge "Add pkg target to snoozing alarm" into rvc-dev am: 0ec06d7b11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b49d21ee357fbb947d0bd6d3dff551613b504f2
 2021-03-05 04:25:46 +00:00
TreeHugger Robot
0ec06d7b11 Merge "Add pkg target to snoozing alarm" into rvc-dev 2021-03-05 00:43:45 +00:00
Dmitry Dementyev
501a44ccfb Merge "Add IMMUTABLE flag to AccountManager pending intents." into rvc-qpr-dev 2021-03-04 23:35:22 +00:00
Leon Scroggins
c1665ffb62 Merge "Fix nine-patches to always filter" into rvc-qpr-dev 2021-03-04 19:58:16 +00:00
Heemin Seog
e076c2344e DO NOT MERGE Add generic rotary support for sysui overlay window 
Bug: 181138897
Test: manual
Change-Id: I353d9587fce09c5dff7328b5dec7e973230f2a9c
 2021-03-04 11:53:18 -08:00
Danny Epstein
033f3edb72 Configure privapp perms for rotary service 
Test: Check for SecurityException on boot in sc-dev branch
Bug: 181577696
Change-Id: Ib0596f87c81fda75c830989ecc57059392b7fc42
Merged-In: Ib0596f87c81fda75c830989ecc57059392b7fc42
 2021-03-04 10:26:51 -08:00
Miranda Kephart
db318cc890 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906326adab8ee3de29aec6c04e872c88862d61dc
 2021-03-04 16:08:49 +00:00
Miranda Kephart
de813c45dd [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c815ff5109965f0015759c7e9bd816406d7ffa4
 2021-03-04 16:08:45 +00:00
Miranda Kephart
9c62f07486 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev 2021-03-04 15:27:25 +00:00
Miranda Kephart
42dc4d3f45 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-qpr-dev 2021-03-04 15:27:13 +00:00
TreeHugger Robot
8d3c2c1455 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-04 06:27:54 +00:00
Bill Yi
17c8f10914 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie9d116b861fdccd54e0d125b499e5613e9bb4a47
 2021-03-04 02:42:44 +00:00
Hall Liu
432bbbcdf2 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 -s ours 
am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 b7cffcab32 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6aacc3b1417f9d3b144e97ed0e5346567044ce2
 2021-03-04 02:41:00 +00:00
Hall Liu
e5496f1e73 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours 
am skip reason: Change-Id Ie82dded77a3eaa75095333b0e77f10e21c9f7caf with SHA-1 a3986a5def is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie006851def2e4621d02b90972b3825538f46b923
 2021-03-04 02:40:57 +00:00
Hall Liu
5fa6de7421 Merge "Allow empty tokens in strict grammar" into rvc-dev 2021-03-04 02:25:54 +00:00
Hall Liu
c5c9242194 Merge "Allow empty tokens in strict grammar" into rvc-dev 2021-03-04 02:25:54 +00:00
TreeHugger Robot
83f12a47be [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a -s ours 
am skip reason: Change-Id Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d39db2db558507fdc40929dd7a302bd9396c5e0
 2021-03-04 02:10:11 +00:00
TreeHugger Robot
7a180dd7ad Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-qpr-dev 2021-03-04 00:36:57 +00:00
TreeHugger Robot
b9e15c3f1a Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev 2021-03-04 00:35:42 +00:00
Hongwei Wang
aec33803a3 Merge "Restrict the overridden min size for PiP" into rvc-dev am: 2ed6d3891b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13746374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I453ace9178d14a715d6ade840c132e9ef74919b3
 2021-03-03 23:51:57 +00:00
Hongwei Wang
2ed6d3891b Merge "Restrict the overridden min size for PiP" into rvc-dev 2021-03-03 23:01:26 +00:00
Mike Reed
da20330b35 Fix nine-patches to always filter 
Regression was introduced here:
c2dbc03acc

Bug: 176691890
Test: I1336d7e70f0e46e57023d7e0b8331ba7cba137ac

Change-Id: I8153f1d6ecd850953369dd664da88915c3842bb5
(cherry picked from commit 0e540d057c)
Merged-In: I8153f1d6ecd850953369dd664da88915c3842bb5
Merged-In: I16f5aaff99ad6d2b6813a75ddbb4c97beb7aa2d8
 2021-03-03 22:11:38 +00:00