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
Josh Imbriani
a66e4ad7c2 Adding documentation to note new intent action changes coming with 
Android 11.

Bug: 155091482
Test: Documentation changes - no test necessary
Change-Id: I2472cd2f94d0dc1fac249f99cd91ae201b1f419b
(cherry picked from commit 4a2a4b1a45)
 2020-07-17 19:34:13 +00:00
Sudheer Shanka
77e1a9e851 Don't try to handle callbacks until mSystemReady is set. 
Bug: 160855861
Bug: 161547406
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Icf570122cae0d9b03319d16df913904bab8ca18d
 2020-07-17 12:22:30 -07:00
Kenny Root
3750b50e76 Resume-on-Reboot: remove special string 
User feedback shows that this string causes confusion that the
update is going to start immediately.

Bug: 161179448
Test: Fake OTA test
Change-Id: I9590ebf76c81ef104f490ba31ada7c482cd70d56
 2020-07-17 11:45:09 -07:00
Elliott Hughes
6844bdf237 Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 am: 9b63f4e904 am: 54cb1fcefb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1215821

Change-Id: I31122b33e74c08efbf4e50dfd693f0ca1359a59b
 2020-07-17 18:22:13 +00:00
Elliott Hughes
54cb1fcefb Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 am: 9b63f4e904 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1215821

Change-Id: Iaf318313dcf27a6cb5a5ff3c45bb6220b9d03faf
 2020-07-17 18:16:08 +00:00
Chavi Weingarten
5c2488134e Revert "Call preserveSurfaces when detaching children." 
This reverts commit 9118c9b573.

Reason for revert: b/161316231

Bug: 161316231
Test: Steps from bug
Change-Id: Ieb76c99d96eb7f261a1bd2680ebf83905c2a5369
 2020-07-17 11:13:01 -07:00
Elliott Hughes
9b63f4e904 Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1215821

Change-Id: If7a6fdfcc4664cb2d1ca13e7d639fb6edbc8d5f4
 2020-07-17 18:11:53 +00:00
Elliott Hughes
285dfb3126 Merge "Zygote: Add Arm pointer authentication keychange support." 2020-07-17 18:01:19 +00:00
Sarah Chin
11f538f963 Merge "Add HANDLE_CAR_MODE_CHANGED permission" into rvc-d1-dev am: 2047572941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173845

Change-Id: Id90b846a504d7160bf24cf0bb058fde2c0be0596
 2020-07-17 17:45:27 +00:00
Sarah Chin
2047572941 Merge "Add HANDLE_CAR_MODE_CHANGED permission" into rvc-d1-dev 2020-07-17 17:43:59 +00:00
Automerger Merge Worker
720cc7ea65 Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 am: fed46df3f3" into rvc-d1-dev-plus-aosp 2020-07-17 17:30:42 +00:00
TreeHugger Robot
61dda21b2b Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 am: b2f5bfcfc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163209

Change-Id: I50fffd460903d41e8b31f56f506ea0ec7317d694
 2020-07-17 17:30:29 +00:00
TreeHugger Robot
3486731dad Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 am: fed46df3f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163209

Change-Id: Idac73348f3ac83d24a15d5a47c3afa01224016fb
 2020-07-17 17:30:25 +00:00
TreeHugger Robot
b2f5bfcfc2 Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163209

Change-Id: Icae3589b44c4a98f67afc659f62346db8a6ddd65
 2020-07-17 17:24:24 +00:00
TreeHugger Robot
fed46df3f3 Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163209

Change-Id: I5bc4dd27fd1fe08ec33b415321d6fc282f3c1b9a
 2020-07-17 17:23:47 +00:00
TreeHugger Robot
94df031718 Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev 2020-07-17 17:19:19 +00:00
Liz Kammer
5aa744a068 Merge "Do not change resources table for overriding apps" into rvc-dev-plus-aosp am: 63a28918d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936028

Change-Id: I88cb231f60632409a5c94bc5769cb5b44c68ab0b
 2020-07-17 16:58:01 +00:00
Liz Kammer
63a28918d5 Merge "Do not change resources table for overriding apps" into rvc-dev-plus-aosp 2020-07-17 16:56:05 +00:00
Wilson Wu
0ebe70cb0f Prevent exception when surrounding text retrieval 
We use same reference from TextView to set the initial
surrounding text. The actual surrounding text may be
modified before retrieval since the mSurroundingText
is mutable. Use a copy of subText should avoid this
concurrent issue.

Bug: 160390184
Test: atest FrameworksCoreTests:EditorInfoTest
Change-Id: I6082a4cae2fcdc4c529dc14e2e5e7a45ab1aae4d
 2020-07-18 00:51:47 +08:00
Automerger Merge Worker
f9895c9b68 Merge "Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d349172 am: f8ec8d3245" into rvc-d1-dev-plus-aosp 2020-07-17 16:35:22 +00:00
TreeHugger Robot
67cf106707 Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d349172 am: f8ec8d3245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174528

Change-Id: Ifc26090ff315e749742b02820d9583979b20b560
 2020-07-17 16:35:09 +00:00
TreeHugger Robot
42ac4982dd Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d349172 am: bf2c10fe3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174528

Change-Id: I38ceace05e09bb75fc2e688a64015c773d587b1f
 2020-07-17 16:34:53 +00:00
TreeHugger Robot
f8ec8d3245 Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d349172 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174528

Change-Id: I827451241c4fec6c848b6ce43cea3f9df7dcd618
 2020-07-17 16:30:01 +00:00
TreeHugger Robot
bf2c10fe3d Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d349172 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174528

Change-Id: I783e42924ae0ba84dfbc270ccaba89a803778b41
 2020-07-17 16:29:50 +00:00
TreeHugger Robot
a13d349172 Merge "Fix stuck IME when IME dialog is focused" into rvc-dev 2020-07-17 16:25:25 +00:00
Adrian Roos
a24622cfcd Fix hiding keyboard animation stuck while dialog dismissing. 
When dismissing a dialog with EditText focused and keyboard shown,
the keyboard does not get correctly dismissed.

This happens because after CL[1] landed, returning to the  activity won't start
new input connection, and the activity will thus not regain control over
the IME.

This fix restores the previous behavior, where  IMM will start a fake input
connection even without an editor.

[1]: I1ef3d341af9d473d94d52fd1890deafbae2bc9e1

Fix: 161273049
Test: atest CtsInputMethodTestCases
Test: manual as follows
     0) Have some files downloaded in the device
     1) Launch Files app > Browse > Click Internal Storage
     2) Long press on any file > From menu, click "Rename"
     3) Enter some name with soft keyboard and click "OK"
     4) Expect Keyboard should hide

Change-Id: I022ad658844142ff4a4cf3b91953013f2bfbb58a
 2020-07-17 18:09:13 +02:00
Automerger Merge Worker
016e96a45e Merge "Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev am: 1ca53a0901 am: 469955b887" into rvc-d1-dev-plus-aosp 2020-07-17 15:23:00 +00:00
TreeHugger Robot
cb1bb0d5f5 Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev am: 1ca53a0901 am: 469955b887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173850

Change-Id: I6ab56a9961a58bf698fd456981310f34d118f6a0
 2020-07-17 15:22:41 +00:00
TreeHugger Robot
65658a2260 Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev am: 1ca53a0901 am: b397305d4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173850

Change-Id: I04455f5775491452a3cdf57f322c7f8cc6bf8dc8
 2020-07-17 15:22:37 +00:00
TreeHugger Robot
b397305d4a Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev am: 1ca53a0901 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173850

Change-Id: I0bead030e1b6aa16ebfe569da4e870466d5143e1
 2020-07-17 15:04:29 +00:00
TreeHugger Robot
469955b887 Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev am: 1ca53a0901 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173850

Change-Id: I71a4e6c974d5e9f82e2275120a765588f4fcd587
 2020-07-17 15:04:29 +00:00
TreeHugger Robot
1ca53a0901 Merge "Fix TextureView calling eglCreateImage with a destructed buffer" into rvc-dev 2020-07-17 14:49:03 +00:00
Adrian Roos
a6beec8e60 Fix stuck IME when IME dialog is focused 
Only the currently focused window will invoke startInput, and thus control the IME.

However, if the IME puts up a focusable dialog, and the requesting activity restarts,
its new window won't regain focus - because the IME dialog still has it. Thus, IMMS
never receives a startInput, and never tells WMS about a new mInputMethodInputTarget.

To address this, we clear mInputMethodInputTarget if it refers to a no longer existing
window, then the empty IME control target will take over, and hide the IME, which will
hide its dialog and let the newly launched WindowState obtain focus and ultimately
control of the IME.

Fixes: 160672060
Test: atest 'DisplayContentTests#testInputMethodInputTarget_isClearedWhenWindowStateIsRemoved'
Change-Id: I138ac7198013635e7fb620921305ed1eb224d4de
 2020-07-17 14:45:58 +02:00
Anton Hansson
f13c105921 Merge "Remove always-empty variable" am: 88a03065a2 am: 734c0ee397 am: 9b89d129d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363577

Change-Id: I765d39d31f5b9c3d158f0f0da18d9276b0e7f477
 2020-07-17 09:52:56 +00:00
Anton Hansson
9b89d129d9 Merge "Remove always-empty variable" am: 88a03065a2 am: 734c0ee397 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363577

Change-Id: Ie10591e45c44b386ecb2138c5d862b03f65ee4f4
 2020-07-17 09:35:20 +00:00
Anton Hansson
734c0ee397 Merge "Remove always-empty variable" am: 88a03065a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363577

Change-Id: I88359d77f76cf8b2cfa6bc88cebe5bd55732fc3a
 2020-07-17 09:19:25 +00:00
Treehugger Robot
e260ebd9af [automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 am: 70b6c13294 -s ours am: 0cb2bb830c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I9ccbfe52c2bdcec25331bb20b8231a73a75dfc6f
 2020-07-17 09:19:25 +00:00
Rubin Xu
ef69c1a670 [automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours am: 5f7b19c7aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I0a31bbce6fbc74984536e387f027edc75c030124
 2020-07-17 09:19:13 +00:00
Treehugger Robot
0cb2bb830c [automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 am: 70b6c13294 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21f23724b7ebf022ff35596dd859057efe890eda
 2020-07-17 09:01:32 +00:00
Rubin Xu
5f7b19c7aa [automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15979ecd70a91d4eeb549524bb2339584cfbe7b3
 2020-07-17 09:01:18 +00:00
Anton Hansson
88a03065a2 Merge "Remove always-empty variable" 2020-07-17 08:51:29 +00:00
Treehugger Robot
70b6c13294 Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I45105973e1a26af563ad72c79b48937100e9f319
 2020-07-17 08:43:53 +00:00
Rubin Xu
294cbeed69 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I7a1a42f3d64dd968f6b09de3b6717c97773daa25
 2020-07-17 08:43:38 +00:00
Treehugger Robot
3846b1e2c2 Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" 2020-07-17 08:28:38 +00:00
Sudheer Shanka
67eaf157db Check app idle states and inform listeners on power-save-wl change. 
Bug: 161477606
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I0bb436f4c45b135c8e9c873c9073ef4a505192f7
 2020-07-16 23:48:32 -07:00
Aaron Huang
6350508edd Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: d8b9f9fc07 am: 251d68487e am: ef48aef3ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757

Change-Id: I9d141616f0efb16874488489f5c382a5eb7f6048
 2020-07-17 06:18:09 +00:00
Aaron Huang
ef48aef3ac Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: d8b9f9fc07 am: 251d68487e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757

Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
 2020-07-17 06:05:38 +00:00
Aaron Huang
251d68487e Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: d8b9f9fc07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757

Change-Id: Ib3e7b1ff5c2fbe3fd9a049b58faf26a6c355ad8f
 2020-07-17 05:53:43 +00:00
Taesu Lee
24115e8823 Fix description of indices for messages in the ICC. 
Bug: 161478651
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I66adaf4e4cd392c837c3719bd1f36a426938933e
 2020-07-17 14:46:44 +09:00
Aaron Huang
d8b9f9fc07 Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" 2020-07-17 05:40:31 +00:00