Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
650,000 Commits 3 Branches 0 Tags
a7ac2cd301dc14f68ee9bedcffd86471421959ae
Commit Graph

650000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Huihong Luo
a7ac2cd301 Merge "Disable Webview Overlay when invisible" into sc-dev am: 94950c3c55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15116633

Change-Id: I87bc4707abc9b0da5e09a8c62cb52a1b6144c614
 2021-07-02 16:23:41 +00:00
Joanne Chung
4636f69aed Merge "Fix translation reference gone problem." into sc-dev am: 3d088cbb09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15172174

Change-Id: I3e4b3094ee279ce40c7fa0684241c1e75023da3e
 2021-07-02 16:23:24 +00:00
TYM Tsai
7ccebc1562 Merge "Notify Content Capture when deselected" into sc-dev am: 598376c6b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126539

Change-Id: I2447c5297b8b7df64fcfada6b771de3dd880f8fa
 2021-07-02 16:23:05 +00:00
Joe Bolinger
5ac85ae317 Merge "Ensure current operation has not changed on start/stop user operations." into sc-dev am: 92ce6e953e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180201

Change-Id: Ib49d837b0abca4a42d7b244598e0698bd18bc2ae
 2021-07-02 16:22:29 +00:00
Les Lee
bbfec3ac07 Merge "wifi: Fix the Security Report for pending intent" into sc-dev am: 0d6266ee6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142994

Change-Id: Ia0478698d164937daffb5c62a7f1319a50358942
 2021-07-02 16:21:18 +00:00
Alexander Dorokhine
4c14688f61 Merge "Add ability to enforce limits on docs per package and size of doc." into sc-dev am: 733537f1a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177523

Change-Id: I984c32aaa25d40bf3faf1216d680c6e0a56e0b9d
 2021-07-02 16:20:37 +00:00
Curtis Belmonte
0d69567e6b Merge "Don't start face auth when device is going to sleep" into sc-dev am: 7499feba94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15176331

Change-Id: I8bdec6882d000de41a0afe1218c2358fcd84e0cf
 2021-07-02 16:20:05 +00:00
TreeHugger Robot
4fdc14920e Merge "Add additional cancel logs." into sc-dev am: 8fba2059e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180261

Change-Id: Ifc188193ec68478335ed2fb5ec367fffdd8a36ca
 2021-07-02 16:19:31 +00:00
Tracy Zhou
64070d6c87 Merge "Update ReOpenImeWindowTest to be in gestural nav mode" into sc-dev am: 6949bcfce7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15152030

Change-Id: Ic8daae235cd5b45951e080b3683e0c082ab1cb6b
 2021-07-02 16:18:55 +00:00
Josh Tsuji
10c3c142cd Merge "Don't return true for controlling screen off once we've already returned false for this sleep." into sc-dev am: 703c8d30da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161982

Change-Id: I05cc3f416cb9c363c306e9a73d4aceb381e0e1e3
 2021-07-02 16:18:13 +00:00
TreeHugger Robot
4abfcc257d Merge "Try to finish data delivery in onDestroy for RecognitionService" into sc-dev am: 0a62adda9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160190

Change-Id: Ifb3ecea2f97a3d8267d3d5a4a82316f4d0ff0227
 2021-07-02 16:17:36 +00:00
Lucas Dupin
5d7d36a821 Merge "Verify if overlay exists before applying it" into sc-dev am: d9c8cc672c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179610

Change-Id: Ie917d1fb7b6c8356f37ee79267130c4cb6d5d422
 2021-07-02 16:17:09 +00:00
Joanne Chung
4dba8b9fd1 Merge "Disable log default dumps in debug ROM" into sc-dev am: 559b8dd078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048193

Change-Id: Iaab263a8583f00d504603ec17e2148941b557436
 2021-07-02 16:16:52 +00:00
Beth Thibodeau
8aa9cd139d Merge "Rename media control flag" into sc-dev am: 9fd619e7e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15151227

Change-Id: I940062728e2ca803dd8c609a9fd595112ac3f745
 2021-07-02 16:15:38 +00:00
Winson Chung
f0dbfd0033 Merge "Don't reorder tasks if the recents animation is not running to home" into sc-dev am: 470baa3157 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132554

Change-Id: Ia0c86c507d5134dfd4f66a8dba390a85a23117d7
 2021-07-02 16:15:19 +00:00
TreeHugger Robot
2acf538ab6 Merge "Change the logic to check car idleness" into sc-dev am: e1f4e0f0eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020076

Change-Id: Iadc21c7001561e104fd418d2147a47c884364747
 2021-07-02 16:14:41 +00:00
Nikita Ioffe
9ebd5b0def Merge "Add ota_dexopt_aidl_interface" am: 847d8f7914 am: e6d87db981 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751350

Change-Id: I3e105ae7becd3f1c03ac5bb5fd3dced94522f4a5
 2021-07-02 14:52:41 +00:00
Nikita Ioffe
e6d87db981 Merge "Add ota_dexopt_aidl_interface" am: 847d8f7914 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751350

Change-Id: I96dbdfe776f2bf23ee5bbb2ce95e2c3f1ac80aa8
 2021-07-02 14:36:34 +00:00
Nikita Ioffe
847d8f7914 Merge "Add ota_dexopt_aidl_interface" 2021-07-02 14:20:12 +00:00
Orion Hodson
3e5b9d4ab7 Merge "AndroidRuntime: pass odsign verification status to ART" am: 2d2d5467b5 am: 57b6391e7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753263

Change-Id: I33d861b530d78772f5707a9d4e808c023a0702a0
 2021-07-02 10:44:29 +00:00
Orion Hodson
57b6391e7e Merge "AndroidRuntime: pass odsign verification status to ART" am: 2d2d5467b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753263

Change-Id: Ia566ae8c8ee8455180e6e365ae4f6b1d41826b8e
 2021-07-02 10:32:54 +00:00
Orion Hodson
2d2d5467b5 Merge "AndroidRuntime: pass odsign verification status to ART" 2021-07-02 10:19:45 +00:00
Les Lee
694e035e6b Merge "fix: Invalid subscription plan cause NPE" am: a8cd54f67a am: cfd0efc88b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749760

Change-Id: I0224a940b7129efb85f5b7c66ed09d781ecb0b8c
 2021-07-02 09:48:18 +00:00
Les Lee
cfd0efc88b Merge "fix: Invalid subscription plan cause NPE" am: a8cd54f67a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749760

Change-Id: I19672ff1d7f2e6e9f864b99e3f837126d9a70030
 2021-07-02 09:34:52 +00:00
Les Lee
a8cd54f67a Merge "fix: Invalid subscription plan cause NPE" 2021-07-02 09:17:20 +00:00
Irmak Eliaçık
d129a2f67d Merge "AudioAttributes FLAG_AUDIBILITY_ENFORCED javadoc update" am: 5e996722d9 am: 08917d0dbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753049

Change-Id: I09f23bfefc6325379d6aa9772bfea5dbfb41311f
 2021-07-02 08:36:53 +00:00
Treehugger Robot
46c57c5f19 Merge "Request location info in UnderlyingNetworkListener" am: ef226bcd35 am: bdaa82e1eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754781

Change-Id: I80900537044a9e05e78a21d80772ec46fadba6e5
 2021-07-02 08:36:24 +00:00
Irmak Eliaçık
08917d0dbd Merge "AudioAttributes FLAG_AUDIBILITY_ENFORCED javadoc update" am: 5e996722d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753049

Change-Id: I758d0b00d876631bf3464a21787c3d766d7c18a0
 2021-07-02 08:21:15 +00:00
Treehugger Robot
bdaa82e1eb Merge "Request location info in UnderlyingNetworkListener" am: ef226bcd35 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754781

Change-Id: Id43603597e3ebd064d75b30cf805142f6aae1304
 2021-07-02 08:20:30 +00:00
Irmak Eliaçık
5e996722d9 Merge "AudioAttributes FLAG_AUDIBILITY_ENFORCED javadoc update" 2021-07-02 08:16:17 +00:00
Treehugger Robot
ef226bcd35 Merge "Request location info in UnderlyingNetworkListener" 2021-07-02 07:59:48 +00:00
Huihong Luo
94950c3c55 Merge "Disable Webview Overlay when invisible" into sc-dev 2021-07-02 04:22:28 +00:00
Joanne Chung
3d088cbb09 Merge "Fix translation reference gone problem." into sc-dev 2021-07-02 03:58:36 +00:00
TYM Tsai
598376c6b5 Merge "Notify Content Capture when deselected" into sc-dev 2021-07-02 03:55:12 +00:00
Joe Bolinger
92ce6e953e Merge "Ensure current operation has not changed on start/stop user operations." into sc-dev 2021-07-02 03:13:53 +00:00
Benedict Wong
89e8793b3a Request location info in UnderlyingNetworkListener 
This change ensures that the UnderlyingNetworkListener receives
location-sensitive fields in order to proxy the location sensitive
fields in the VcnTransportInfo

Bug: 192587440
Test: manual tests
Test: atest FrameworksVcnTests
Change-Id: Id42ae2e373d909424c3f213412ea4731ee01fa2b
 2021-07-02 03:13:20 +00:00
Les Lee
0d6266ee6c Merge "wifi: Fix the Security Report for pending intent" into sc-dev 2021-07-02 02:39:38 +00:00
Joanne Chung
844cc85ddf Fix translation reference gone problem. 
1. We save Translator WeakReference in ServiceBinderReceiver.
It has a chance the reference is gone even the session is still
alive. Save Translator instead of WeakReference.
2. Fix not access TranslationManager mTranslators, mTranslatorIds in
the lock.
3. Fix protential NPE of resultData access in ServiceBinderReceiver.

Bug: 192205945
Test: manual. The function works.
Test: atest CtsTranslationTestCases

Change-Id: I158901db4bbcd76203c705ab2a34f1e0b37c7565
 2021-07-02 10:12:32 +08:00
Alexander Dorokhine
733537f1a6 Merge "Add ability to enforce limits on docs per package and size of doc." into sc-dev 2021-07-02 01:46:27 +00:00
Curtis Belmonte
7499feba94 Merge "Don't start face auth when device is going to sleep" into sc-dev 2021-07-02 01:44:30 +00:00
Tianjie Xu
c6cc6d355e Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0 am: c8eebe97e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753600

Change-Id: I72f16350e2d703e20c1c3a4f9b2054ed02700bfa
 2021-07-02 01:35:53 +00:00
Treehugger Robot
7ad93b5cd2 [automerger skipped] Merge "Hopefully fix validatekeymaps mac build." am: 65cef543b4 am: 83aa7c349c -s ours 
am skip reason: Merged-In Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4 with SHA-1 4bfc6508ab is already in history

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

Change-Id: Ibee7d5afe9f16cea52b2accc7aaec23cd2e8e55c
 2021-07-02 01:35:38 +00:00
Tianjie Xu
873b437983 Merge "Add shell command to query if lskf is captured" am: 5b435f9cbc am: d148f09646 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740613

Change-Id: Ib952412b1990264d123be2ddae4c34c606d9bec3
 2021-07-02 01:34:53 +00:00
Tianjie Xu
c8eebe97e7 Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753600

Change-Id: Idf0dce1c0c85f37a8c329180b4c06639ab970a05
 2021-07-02 01:25:30 +00:00
TreeHugger Robot
8fba2059e7 Merge "Add additional cancel logs." into sc-dev 2021-07-02 01:25:17 +00:00
Treehugger Robot
83aa7c349c Merge "Hopefully fix validatekeymaps mac build." am: 65cef543b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753601

Change-Id: I9848a71f464cb9c0ee127559f67e88f0f96b2d92
 2021-07-02 01:24:55 +00:00
Tianjie Xu
d148f09646 Merge "Add shell command to query if lskf is captured" am: 5b435f9cbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740613

Change-Id: Ie7bf57a177dc4fb6eaea0ecbc7b72716ed6240a1
 2021-07-02 01:23:47 +00:00
Tracy Zhou
6949bcfce7 Merge "Update ReOpenImeWindowTest to be in gestural nav mode" into sc-dev 2021-07-02 01:04:04 +00:00
Josh Tsuji
703c8d30da Merge "Don't return true for controlling screen off once we've already returned false for this sleep." into sc-dev 2021-07-02 00:34:09 +00:00
TreeHugger Robot
0a62adda9c Merge "Try to finish data delivery in onDestroy for RecognitionService" into sc-dev 2021-07-02 00:21:45 +00:00