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
Fabian Kozynski
82487ffae4 Merge "Change error and none messages" into rvc-dev am: 695deeae89 am: 43b15b0f68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872618

Change-Id: Ifc2c21258a1f8b8604ca95241bf09819d2429a7e
 2020-06-16 14:00:56 +00:00
Fabian Kozynski
854d5c6da7 Merge "Change error and none messages" into rvc-dev am: 695deeae89 am: 76f6b29251 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872618

Change-Id: Iea2bee861ac55a53880ecddaa08b0bdea2956d36
 2020-06-16 14:00:40 +00:00
Charles Chen
94deecfda2 Merge "Trust System UI owned display to receive keys" into rvc-dev 2020-06-16 13:56:55 +00:00
Fabian Kozynski
43b15b0f68 Merge "Change error and none messages" into rvc-dev am: 695deeae89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872618

Change-Id: I3b8eb57970a1756f166ed267876bf73bbc5085fd
 2020-06-16 13:46:25 +00:00
Fabian Kozynski
76f6b29251 Merge "Change error and none messages" into rvc-dev am: 695deeae89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872618

Change-Id: I6351bd9e71faef03e349cb2820ffdc53ba75d2bc
 2020-06-16 13:46:20 +00:00
Fabian Kozynski
695deeae89 Merge "Change error and none messages" into rvc-dev 2020-06-16 13:33:15 +00:00
Automerger Merge Worker
d165bed56d Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: ebdc01a8f3" into rvc-d1-dev-plus-aosp am: 55b512217b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Ic25916b9f7749568325b92e9385b8c6864e98806
 2020-06-16 13:28:02 +00:00
Automerger Merge Worker
b7cb446ed8 Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 am: 1be0abe801" into rvc-qpr-dev-plus-aosp 2020-06-16 13:27:29 +00:00
Jorim Jaggi
496e4db26a Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 am: 7385b9a282 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Ibb9e25c0e35ce3fe92538be7c8d7cc5fbac2e90d
 2020-06-16 13:27:11 +00:00
Jorim Jaggi
7960311c29 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 am: 1be0abe801 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Ib8c3a7c61dccc783b858b18402dc6248e0aedb2b
 2020-06-16 13:27:10 +00:00
Automerger Merge Worker
55b512217b Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: ebdc01a8f3" into rvc-d1-dev-plus-aosp 2020-06-16 13:17:49 +00:00
Jorim Jaggi
656288c5f8 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: ebdc01a8f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Idc47a7fe67491a2f114dbba9261a48ee4bfdff83
 2020-06-16 13:17:38 +00:00
Jorim Jaggi
7385b9a282 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: I7c390f61553739359310c525eba74317371f3c23
 2020-06-16 13:17:34 +00:00
Jorim Jaggi
1be0abe801 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Id5cc186977217a4da3f3744b2d7c92385b00c9d4
 2020-06-16 13:17:28 +00:00
Jorim Jaggi
ebdc01a8f3 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: I4c25f9752a8c2584754cc83579a7d8975da772e4
 2020-06-16 13:05:38 +00:00
Jorim Jaggi
b589824526 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Ibdbcc69bd646ba1d555478750f20eb3c0f9e81be
 2020-06-16 13:05:35 +00:00
Jorim Jaggi
8ec4d3a33f Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev 2020-06-16 12:56:20 +00:00
Govinda Wasserman
d22b566428 Merge "Migrates additional Assistant logging to Westworld" into rvc-d1-dev-plus-aosp am: e52b335e19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871753

Change-Id: I5364b995dcb9b6d98df5253a0488f38829c436c2
 2020-06-16 12:32:22 +00:00
Govinda Wasserman
e52b335e19 Merge "Migrates additional Assistant logging to Westworld" into rvc-d1-dev-plus-aosp 2020-06-16 12:24:25 +00:00
Yo Chiang
a8e0b66a2d [automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5 am: 46201ccf32 -s ours am: f357ca6357 am: a9867b9a3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I5b84393eaf15fcd5d3014c1a94d2c63a9279271d
 2020-06-16 12:18:07 +00:00
Yo Chiang
2cb31cdca2 [automerger skipped] DO NOT MERGE Temporarily rename the package name of BugReportApp am: 2812c3b042 am: d2704f1693 -s ours am: 0bdf68400b am: f070dfbb12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I26cd12f7a5dfbbfea6dea5095975ddb899aad907
 2020-06-16 12:17:51 +00:00
Yo Chiang
a9867b9a3a [automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5 am: 46201ccf32 -s ours am: f357ca6357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I76ff639e1fec4f4dd3a33042596b3d92306d1b34
 2020-06-16 12:07:15 +00:00
Yo Chiang
f070dfbb12 [automerger skipped] DO NOT MERGE Temporarily rename the package name of BugReportApp am: 2812c3b042 am: d2704f1693 -s ours am: 0bdf68400b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I21b25e3d633acc9ff440507ddaf92e6d50e2a9e4
 2020-06-16 12:07:11 +00:00
Treehugger Robot
0e1e1b8ceb [automerger skipped] Merge "services/backup/OWNERS: Sync with internal version." am: 9cc2f77917 am: 26a6905fae -s ours am: 4275518955 -s ours am: 933e578ef5 -s ours 
am skip reason: Change-Id I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e with SHA-1 a7fcdc930e is in history

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

Change-Id: I96bea8f02b4563891eb3b78087cecfa81f3f08b0
 2020-06-16 12:03:42 +00:00
Yo Chiang
f357ca6357 [automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5 am: 46201ccf32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf0ff9cc2e6381fe70f3f4a0c93b0bbab25fdadc
 2020-06-16 11:59:03 +00:00
Yo Chiang
0bdf68400b [automerger skipped] DO NOT MERGE Temporarily rename the package name of BugReportApp am: 2812c3b042 am: d2704f1693 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6beb9b6ec87cf15130154dcd7e33aa1e98269e78
 2020-06-16 11:58:52 +00:00
Treehugger Robot
933e578ef5 [automerger skipped] Merge "services/backup/OWNERS: Sync with internal version." am: 9cc2f77917 am: 26a6905fae -s ours am: 4275518955 -s ours 
am skip reason: Change-Id I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e with SHA-1 a7fcdc930e is in history

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

Change-Id: I76a8c730a0b970a132a9b89ec330106e1ce09879
 2020-06-16 11:46:43 +00:00
Yo Chiang
46201ccf32 Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I35e4304d472aa1a307bcf7c0720a555a28a80455
 2020-06-16 11:46:31 +00:00
Yo Chiang
d2704f1693 DO NOT MERGE Temporarily rename the package name of BugReportApp am: 2812c3b042 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331059

Change-Id: I4c68e2b212209cb579e71447d791548236397c57
 2020-06-16 11:46:25 +00:00
Yo Chiang
5218a1f9e5 Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" 2020-06-16 11:30:46 +00:00
Treehugger Robot
4275518955 [automerger skipped] Merge "services/backup/OWNERS: Sync with internal version." am: 9cc2f77917 am: 26a6905fae -s ours 
am skip reason: Change-Id I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e with SHA-1 a7fcdc930e is in history

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

Change-Id: I13000eba840d226eca659a6deeeffb730caa427a
 2020-06-16 11:25:47 +00:00
Treehugger Robot
26a6905fae Merge "services/backup/OWNERS: Sync with internal version." am: 9cc2f77917 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1337176

Change-Id: Ica345b8930955eec4ff8c4edf3b3690683586ca9
 2020-06-16 11:13:52 +00:00
markchien
0ed433e4cd Protect invalid entitlement app configuration 
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.

In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.

After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.

Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
 2020-06-16 19:06:34 +08:00
Treehugger Robot
9cc2f77917 Merge "services/backup/OWNERS: Sync with internal version." 2020-06-16 11:02:39 +00:00
Automerger Merge Worker
753af5a6d6 Merge "Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 4a911583b3" into rvc-d1-dev-plus-aosp am: 5b9e8d6783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: Ib9a1e8f44ab1a035cdb564593b4f86cc62466453
 2020-06-16 10:56:03 +00:00
Automerger Merge Worker
ae26f61b73 Merge "Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 06a12085ab am: 454106d01a" into rvc-qpr-dev-plus-aosp 2020-06-16 10:55:50 +00:00
Nikita Ioffe
303a31397c Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 06a12085ab am: 454106d01a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: I138c50d27ade51eab45587a46ffb70b4f2833897
 2020-06-16 10:55:42 +00:00
Nikita Ioffe
f522b98926 Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 06a12085ab am: bf11408260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: Ifbd398345e07240d8f7b36ca1fa85fb79c2fed21
 2020-06-16 10:55:40 +00:00
Automerger Merge Worker
5b9e8d6783 Merge "Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 4a911583b3" into rvc-d1-dev-plus-aosp 2020-06-16 10:38:47 +00:00
Nikita Ioffe
454106d01a Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 06a12085ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: Idbb87c8c75877c722c049d73f6fe4e77ce050353
 2020-06-16 10:38:34 +00:00
Nikita Ioffe
4fb883b984 Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 4a911583b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: Ia9092c89bbc6ae84e73f84981244479f8b0cecc8
 2020-06-16 10:38:34 +00:00
Nikita Ioffe
bf11408260 Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 06a12085ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: I58536f75ebb7fa4ed177303837803a48df5d41b0
 2020-06-16 10:38:27 +00:00
Nikita Ioffe
4a911583b3 Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: I1446f282205ed5da4256ca9995e3d97020525f50
 2020-06-16 10:20:37 +00:00
Nikita Ioffe
06a12085ab Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797136

Change-Id: Idbbd56941c03060fb57f49f4860c27f3fadba557
 2020-06-16 10:20:21 +00:00
Nikita Ioffe
27d6605c52 Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev 2020-06-16 10:02:49 +00:00
Hungming Chen
ef8199db91 [BOT.13] Make offload coordinator poll interval configurable 
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: I7f8dde3b57ee14eb33edbe2fd383df33cccc231c
 2020-06-16 18:01:24 +08:00
Hungming Chen
f3853106db [BOT.12] Add unit test for disabling BpfCoordinator by config 
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Iedb936b7592b6be773d1b84a2498bfc5a440a198
 2020-06-16 18:01:17 +08:00
Shawn Lin
ad8c08b7ce Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e am: f5adbef7b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: Id1615afb0c41efb24baaaa544f25c0acb7319af4
 2020-06-16 09:53:20 +00:00
Tiger Huang
4aad7fe508 Merge "Disable user animations on insets whose visible frame is empty" into rvc-dev am: ae9ce9716d am: 07d77fce08 am: fdb136d454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11754098

Change-Id: I0da8284ff1d44e0b4f6cb0dd3f46e0f8a895d925
 2020-06-16 09:53:03 +00:00
Sudheer Shanka
c5ee68a661 Merge "Clear data from failed commits and recommits properly." into rvc-dev am: fc424b9a32 am: 5efe0a6c21 am: 76c7555c71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859962

Change-Id: Id93a381ffe58cdb61dfe40bbf3898bd8165dcfba
 2020-06-16 09:52:51 +00:00