Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Chien
c1c5aa7b2f Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 29e59cf89e am: 070e090a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: I3e9712d214d5f58e14f06763f1e5dc91d8d60b2d
 2020-06-17 03:15:37 +00:00
Taran Singh
6c240d1432 Don't allow pinned window to be IME target 
SysUi's PIP window (PipMenuActivity) is always focusable,
transparent and yet never should be an IME target.

Bug: 158881678
Test: atest WindowStateTests#testCanBeImeTarget
Change-Id: Ie863dd1037d0c446f35a8b1ec07c18efaddb1840
 2020-06-17 03:13:35 +00:00
Mark Chien
070e090a32 Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 29e59cf89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: I2b5b8b9054561a8e9a288cb15465ede56e4a9754
 2020-06-17 02:58:21 +00:00
Janis Danisevskis
edcacd5374 Preserve interrupted state across waiting for future 
A normal synchronous binder call would not be influenced by an
interrupted thread. With the move to asynchronous keystore IPC we wait
on a future which can throw an interrupted exception. The Java crypto
API does not expect the implementation to throw interrupted exceptions
though. So to preserve the expected behavior we wrap the Future.get()
calls in a loop that handles the interrupted exception and sets the
interrupted state after the get completed successfully.

Bug: 147398412
Bug: 155254932
Test: atest android.keystore.cts.CipherTest#testEncryptsAndDecryptsInterrupted
Change-Id: I066180e8028cc426fa1b3739fa007faa17c8c012
Merged-In: I066180e8028cc426fa1b3739fa007faa17c8c012
 2020-06-16 19:54:38 -07:00
Robert Snoeberger
d4efdae481 Recreate players when density or font changes 
Fixes: 158515519
Test: manual - change display size in settings and check that player
updated.

Change-Id: I07faa2b453a08b2b4adb923c28975edaf7e49295
 2020-06-16 22:52:12 -04:00
Mark Chien
29e59cf89e Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: I1d9075a7c112dd1345d6a8dacf343886dc1b286b
 2020-06-17 02:47:31 +00:00
Kevin Chyn
19d5aad574 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: 18dbde4e86 am: f7fac3c761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: Ice8ab69b0156fab07131554f62cf32184ad8479b
 2020-06-17 02:34:04 +00:00
Mark Chien
06b2e1cb17 Merge "Protect invalid entitlement app configuration" into rvc-dev 2020-06-17 02:29:34 +00:00
Kevin Chyn
f7fac3c761 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: 18dbde4e86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: Ia331e97ecae8d9a5ff2925f36c8864ee2c041315
 2020-06-17 02:14:58 +00:00
Bill Yi
7d71ebca99 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I24a05eb4e6edec94420ca49edf8441f936e3cea8
 2020-06-17 02:07:05 +00:00
Kevin Chyn
18dbde4e86 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: I173d8bafb4a02c925721b75eec2f42c398a49c43
 2020-06-17 01:57:45 +00:00
Hall Liu
75d8c3aa14 Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e am: 3293dd1e64 am: 2d0fdbdd53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753

Change-Id: Ic35aa202935163c93753badd7acc7d749db57ba0
 2020-06-17 01:56:28 +00:00
Hall Liu
14c87e3366 Merge "Fix docs for LISTEN_CELL_LOCATION" am: 11bc785006 am: da209d4ec0 am: 4e20f7833a am: 71bcc61412 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340733

Change-Id: I1fd239be73710455a0bbc113d9d54025d733e1e8
 2020-06-17 01:55:39 +00:00
Josh Tsuji
80784b98ca Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: f2dcc8a652 am: 98179a4e5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: I2863a5312038dcfa79484ed91039cbcf8e363c5c
 2020-06-17 01:55:24 +00:00
Hayden Gomes
4909aa1948 Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: 9bb1cf5ada am: 1ab17bff75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I73889a3148dcededcec9c8565c9a58f51e76f901
 2020-06-17 01:53:57 +00:00
Hai Zhang
73310e60a7 Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: d199b48fbb am: 023b67e8ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I920d8d05d60927b6cd6cd1c2659a4684768f0aef
 2020-06-17 01:53:31 +00:00
Lyn Han
442e92eec1 Ellipsize user edu title/desc; max 2 line title 
Fixes: 158468860
Test: force show user ed with long two line title: title takes up 2 lines, title and desc ellipsized

Change-Id: I1dd4aa678d0ed865ec78619556ebe05e585163ba
 2020-06-16 18:49:47 -07:00
Muhammad Qureshi
4f4910ab73 Rename "Westworld" to "Statsd" 
Bug: 158725651
Test: N/A; trivial name change
Change-Id: I1bac4ad010ff7fea62a9d9564ba981d74b206aff
 2020-06-16 18:45:22 -07:00
Kevin Chyn
9cd814be2a Merge "Update biometric/keystore documentation" into rvc-dev 2020-06-17 01:43:09 +00:00
Bill Yi
34e06cfb4a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I1340884eb4ef58cc989d7854943d843110e4ec58
 2020-06-17 01:42:42 +00:00
Hall Liu
2d0fdbdd53 Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e am: 3293dd1e64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753

Change-Id: I14b01435fa3a959a132d7143324ce943cebb9293
 2020-06-17 01:36:30 +00:00
Hall Liu
71bcc61412 Merge "Fix docs for LISTEN_CELL_LOCATION" am: 11bc785006 am: da209d4ec0 am: 4e20f7833a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340733

Change-Id: I449e8816c79c146b9339dccb6acee57868821748
 2020-06-17 01:36:12 +00:00
Josh Tsuji
98179a4e5d Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: f2dcc8a652 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: Ie156ad7ccd61669374549bef2cc2597a91f34e96
 2020-06-17 01:35:51 +00:00
Hall Liu
3293dd1e64 Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753

Change-Id: Ic643ef7b31f62a6771c1f1ba5aa0e4c0a16e7e0c
 2020-06-17 01:34:55 +00:00
Hayden Gomes
1ab17bff75 Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: 9bb1cf5ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I4dc548993de207a61c05c519c065a5eb97aed766
 2020-06-17 01:34:49 +00:00
Hai Zhang
023b67e8ea Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: d199b48fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: Icfe2d0fbf86085091ff20e11718ea0cc5eaa2d32
 2020-06-17 01:34:35 +00:00
Hall Liu
4e20f7833a Merge "Fix docs for LISTEN_CELL_LOCATION" am: 11bc785006 am: da209d4ec0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340733

Change-Id: I34e48a0e873e5dc9d564aa914283f4d3b7a4db76
 2020-06-17 01:34:23 +00:00
Josh Tsuji
f2dcc8a652 Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: I549e63ff323f54bd20bd1afaa09bd2ac8fe94643
 2020-06-17 01:16:12 +00:00
Hall Liu
1ab98f185e Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753

Change-Id: Ic85edb32b9dac901e3e8f40c362ebc851ea2e25f
 2020-06-17 01:15:46 +00:00
Hayden Gomes
9bb1cf5ada Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I113fe2dbd1afd663621f9c79b0781ac3827e72c7
 2020-06-17 01:15:32 +00:00
Josh Tsuji
da630a0779 Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev 2020-06-17 01:14:52 +00:00
Hall Liu
da209d4ec0 Merge "Fix docs for LISTEN_CELL_LOCATION" am: 11bc785006 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340733

Change-Id: I6ab1af75a2865ccc5330afcc83017903bdefeb66
 2020-06-17 01:14:30 +00:00
Hai Zhang
d199b48fbb Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I40b536404ad3ff183645b57bbd9e1fec433ea5b6
 2020-06-17 01:14:28 +00:00
TreeHugger Robot
735b5257d6 Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 am: 38972ce1f6 am: a95675bfcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: I8642a0a64c63e34be93f247d738bdb94d667b12d
 2020-06-17 01:14:07 +00:00
Hayden Gomes
ee67875159 Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev 2020-06-17 01:09:39 +00:00
Hall Liu
94091aceaa Merge "Mark TelecomManager#isRinging as a TestApi" 2020-06-17 01:07:28 +00:00
Hai Zhang
f654a5c22e Merge "Skip generating missing permission state for unknown permissions." into rvc-dev 2020-06-17 01:00:18 +00:00
Steve Elliott
4594603f1e Fix alignment of expanded bundled group convo avatar 
Fixes: 159043203
Test: manual
Change-Id: If8d5b906d79c9dfcc5e99d8162f73d0f7d09e6e1
 2020-06-16 20:58:52 -04:00
Steve Elliott
7da4bccd8a Truncate sender name in collapsed group message. 
Fixes: 158769554
Test: manual, visual
Change-Id: I861d6ef755eac2c41e3ae2e2ca01d4a2dfeeecc8
 2020-06-16 20:58:52 -04:00
Bill Yi
c601239867 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I80a1c27482f13d7ea420e218aad8148165ba22e0
 2020-06-17 00:54:39 +00:00
TreeHugger Robot
a95675bfcf Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 am: 38972ce1f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: If2e1fe9ee2983bd5414ca65a8777ce278a1474ae
 2020-06-17 00:54:27 +00:00
Hall Liu
11bc785006 Merge "Fix docs for LISTEN_CELL_LOCATION" 2020-06-17 00:53:07 +00:00
Lucas Dupin
281d646a39 Fix issue where player wouldn't expire 
Cancellation was being registered only after the first playback state
change. Now I'm forcing registration right after the listener was
created.

Test: atest MediaTimeoutListenerTest
Fixes: 158528088
Fixes: 158788030
Change-Id: I53ffef8c1609212a396ebb2235301c53ca315baf
 2020-06-16 17:51:37 -07:00
TreeHugger Robot
38972ce1f6 Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: Iecdbbd14f2a4e78b1614b199efb4abd004c6445b
 2020-06-17 00:38:07 +00:00
TreeHugger Robot
3764cbaac4 Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev 2020-06-17 00:16:36 +00:00
Bill Yi
0c12a655e5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I9cb79cabfd2e520ec8bd8591f46ae334a5de025b
 2020-06-17 00:09:39 +00:00
Calvin Huang
6d0f852c6f Revert "Set overlayable for CarsystemUI NavBar" 
This reverts commit 165bf8f44a.

Reason for revert: b/159143515

Test: build sdk_gcar_x86, nav bar overlay should work as usual
Bug: 159143515
Change-Id: I34e7a0925dd2fb243a11ddd46ac75fbcf3a92f3b
 2020-06-17 00:07:01 +00:00
Ruchir Rastogi
197107c007 Fix TestSubscriberDimensionWrite 
Test: m statsd_test && adb sync data && adb shell
data/nativetest64/statsd_test/statsd_test64
Bug: 148954476
Change-Id: I3d2112f85460701d49103a5bfdc8cf0829ea091a

Change-Id: I07813393c6226252ee839ab16f411f9f92442ada
 2020-06-16 17:06:23 -07:00
TreeHugger Robot
cc8fc3725f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0400518f05 -s ours am: 1d6701099e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1af62ca1818876f0ab03e21b9ca9e71d19ec3d99
 2020-06-17 00:04:54 +00:00
TreeHugger Robot
07b4d59d35 Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: c727d39f86 am: edce56bd21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859

Change-Id: Idfdbd4dbd5aa7cdcd6526625eb2e82e77d295bf4
 2020-06-17 00:04:26 +00:00