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
Nikita Dubrovsky
683471b029 Merge "Change cursor drag threshold from 30 to 45 degrees from vertical" into rvc-dev am: f44a60bd69 am: 3df7b0ebab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052997

Change-Id: Id8b51f35868d957b83a23adb0b0938e796a57205
 2020-07-08 17:01:14 +00:00
Nikita Dubrovsky
c84cbdb149 Merge "Change cursor drag threshold from 30 to 45 degrees from vertical" into rvc-dev am: f44a60bd69 am: cf4e0dc46b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052997

Change-Id: I7f6e8c123137d080951740e195decdfa51a1da1e
 2020-07-08 17:01:10 +00:00
Steven Moreland
d16ad56f35 Merge "HIDL Java: DeadObjectException" am: 628198a90f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355810

Change-Id: I95606f04b8e10c30e9af2ce23b4292457b873ec6
 2020-07-08 16:55:32 +00:00
Nikita Dubrovsky
cf4e0dc46b Merge "Change cursor drag threshold from 30 to 45 degrees from vertical" into rvc-dev am: f44a60bd69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052997

Change-Id: Ie8a3eee8e2030bb429531d0f13df4302d4908072
 2020-07-08 16:46:34 +00:00
Nikita Dubrovsky
3df7b0ebab Merge "Change cursor drag threshold from 30 to 45 degrees from vertical" into rvc-dev am: f44a60bd69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052997

Change-Id: I76b9d12597161e729ee5dba6a51fff5302158c5e
 2020-07-08 16:46:20 +00:00
Steven Moreland
628198a90f Merge "HIDL Java: DeadObjectException" 2020-07-08 16:45:34 +00:00
Charles Chen
3b8e8d7631 Fix NPE when invoking Context#isUiContext 
Add null checks in both ContextWrapper and before obtaining
ContextImpl#getOuterContext.

Test: atest ContextTest#testIsUiContext_ContextWrapper
fixes: 160037462
Change-Id: Ic6a71dd9ac4b195d219d6e5431f2f2b199a400fa
 2020-07-08 23:58:58 +08:00
Nikita Dubrovsky
f44a60bd69 Merge "Change cursor drag threshold from 30 to 45 degrees from vertical" into rvc-dev 2020-07-08 15:40:16 +00:00
Automerger Merge Worker
32068d8fec Merge "Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 am: 5f6eeb589d" into rvc-d1-dev-plus-aosp 2020-07-08 14:03:31 +00:00
András Klöczl
8d2d80ee7b Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 am: 5f6eeb589d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048551

Change-Id: Ia581d51159f495f3762deeee7ab7daa9dda6932e
 2020-07-08 14:03:19 +00:00
András Klöczl
94d3e7aff1 Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 am: 1410238143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048551

Change-Id: Iac5e1f90f3e5b652608a57f5353d2fefacc7cb32
 2020-07-08 14:03:08 +00:00
András Klöczl
5f6eeb589d Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048551

Change-Id: I59a6160ca69dc7c476973d9c6bf5a2495cc5a694
 2020-07-08 13:53:44 +00:00
András Klöczl
1410238143 Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048551

Change-Id: I1e8ece511be2e107a6889641cba91d9a4b12523c
 2020-07-08 13:53:16 +00:00
András Klöczl
8652415a13 Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev 2020-07-08 13:33:41 +00:00
Nikolas Havrikov
74941c20ed Make Shell require permission for a new CTS test 
The permission RESET_APP_ERRORS is required for UnsupportedErrorDialogTests

Bug: 159443507
Test: built locally
Change-Id: I4d110278eb48799caf29f0582536a4dca10f10c1
 2020-07-08 12:09:27 +00:00
Jerry Chang
acd05fa33e Prevent system reset staged installer bypass flag unexpactly 
Perform stage installer check and consume bypass flag only when it's
creating stage session and was not calling from system/shell.

Fix: 159412477
Fix: 159684099
Test: atest CtsStagedInstallHostTestCases
Change-Id: Ic5439ad57b3c475d36746b1b36a99618c5b09ad6
 2020-07-08 20:08:38 +08:00
Tobias Thierer
7b5aeaa798 Merge "services/backup/OWNERS: Add more people." am: 944082eca5 am: 87783595af am: fdf9fe2499 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1341773

Change-Id: Ifeefd1eeb25a0a4fcc930faf106aaa2e107de9da
 2020-07-08 11:41:26 +00:00
Tobias Thierer
fdf9fe2499 Merge "services/backup/OWNERS: Add more people." am: 944082eca5 am: 87783595af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1341773

Change-Id: I7e93f5e05f1834034fdea4b86a4bc96edd4a2d64
 2020-07-08 11:32:32 +00:00
Tobias Thierer
87783595af Merge "services/backup/OWNERS: Add more people." am: 944082eca5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1341773

Change-Id: Ia98960057b3193f7a0a3844ed795e2207c5562b5
 2020-07-08 11:15:51 +00:00
Tobias Thierer
944082eca5 Merge "services/backup/OWNERS: Add more people." 2020-07-08 11:03:13 +00:00
Paul Hu
472d6dfa22 Merge "[RFPM02] Add Dependencies class for injection in tests." am: b95025b2ba am: a99e0b1b95 am: 95f39d34d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291

Change-Id: Id5b673bee68adda4991633d09db8f17055775cde
 2020-07-08 10:47:44 +00:00
Paul Hu
95f39d34d4 Merge "[RFPM02] Add Dependencies class for injection in tests." am: b95025b2ba am: a99e0b1b95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291

Change-Id: If53e1521327c8d9f1fd2a5debb94c58ed25b2880
 2020-07-08 10:35:21 +00:00
Paul Hu
a99e0b1b95 Merge "[RFPM02] Add Dependencies class for injection in tests." am: b95025b2ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291

Change-Id: Ibc81b90c9a7428f63afcb6bad27eb593cf2f628e
 2020-07-08 10:24:36 +00:00
Paul Hu
b95025b2ba Merge "[RFPM02] Add Dependencies class for injection in tests." 2020-07-08 10:07:23 +00:00
Chalard Jean
7af09d002d Add some more public doc for MacAddress 
Bug: 140807677
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1354447
Merged-In: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
 2020-07-08 09:38:37 +00:00
Ryan Lin
2a0c90de7e Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: 58094f5687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ib3d23ed46e8ae6ef4d2e6ff2ce6e998c8c229255
 2020-07-08 07:42:53 +00:00
ryanlwlin
ce25992437 [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 7d4d9ab906 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: I5b4d08c18ed836a5e973a9d45fa62daeec5bf684
 2020-07-08 07:42:42 +00:00
Automerger Merge Worker
38f60684ba Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b
  [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33
 2020-07-08 07:42:28 +00:00
Ryan Lin
c71cc8a299 Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ief600f089ab176da59746fe2f21c2d4b26f3182d
 2020-07-08 07:42:21 +00:00
ryanlwlin
5191bd82f0 [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ifda9f5954fa949ea3d66e367f24de40f12428a91
 2020-07-08 07:42:09 +00:00
Automerger Merge Worker
0d878a3e1f Merge "Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 am: c06a5dab50" into rvc-d1-dev-plus-aosp 2020-07-08 07:42:04 +00:00
Issei Suzuki
cd3666793c Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 am: c06a5dab50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12098183

Change-Id: Ic380c3cd3c41936ad278968081454cca6d3ee469
 2020-07-08 07:41:51 +00:00
Issei Suzuki
f38cb395f7 Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 am: adf2eec803 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12098183

Change-Id: I5dc572f418dadf607f7bd6caa1c213d958aaf5f5
 2020-07-08 07:41:44 +00:00
paulhu
d7c5c46776 [RFPM02] Add Dependencies class for injection in tests. 
Add Dependencies class in PermissionMonitor for injection
in tests easily.

Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ibb84d548908f7a955fa0ff206794486733259978
 2020-07-08 15:30:42 +08:00
Ryan Lin
58094f5687 Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ib32c21c45c677a0ea0e037864602d677ed399182
 2020-07-08 07:25:01 +00:00
Ryan Lin
d6744b0a9b Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: I3b58b07a79f5a8edf2a5ce8c4ade57262d36d284
 2020-07-08 07:24:56 +00:00
ryanlwlin
63a3ab4e33 [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: I5de4599c4f13937523125b73be4199918752024d
 2020-07-08 07:24:52 +00:00
ryanlwlin
7d4d9ab906 [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ibef78f85305755c392573374944c12d1238df357
 2020-07-08 07:24:50 +00:00
Issei Suzuki
c06a5dab50 Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12098183

Change-Id: I1ed7e12ce87c16e3a30f414e0818b6c9a3f87a55
 2020-07-08 07:24:21 +00:00
Issei Suzuki
adf2eec803 Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12098183

Change-Id: Iaf4f8e7c54e851727ad0a40e60a2a8364875eff3
 2020-07-08 07:24:07 +00:00
Ryan Lin
cdaa4f3cb0 Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev 2020-07-08 07:14:00 +00:00
Issei Suzuki
35cd1a6a87 Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev 2020-07-08 07:11:48 +00:00
Chalard Jean
526dc71822 Merge "Add some more public doc for MacAddress" am: 758d6bd8d0 am: 28d7770303 am: 3b04eba16b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447

Change-Id: I52460b43a5d225668714c44fb5804899feb3b83a
 2020-07-08 05:51:01 +00:00
Treehugger Robot
2a8e461cab Skip testPhysicalEthernet if the test run adb over network 
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.

Bug: 160389275
Test: atest CtsTetheringTest

Merged-In: I57d365d33316881c50c3bf7fd1c98926d10842d3
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
 2020-07-08 05:40:52 +00:00
Chalard Jean
3b04eba16b Merge "Add some more public doc for MacAddress" am: 758d6bd8d0 am: 28d7770303 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447

Change-Id: I5c9061fa832c75c9e0476c54bacec3deb114a96d
 2020-07-08 05:38:59 +00:00
Chalard Jean
28d7770303 Merge "Add some more public doc for MacAddress" am: 758d6bd8d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447

Change-Id: I1126b78eb886c5c84afa107b028fe2569d7573e4
 2020-07-08 05:29:56 +00:00
Treehugger Robot
f4f528d8ad Merge "Skip testPhysicalEthernet if the test run adb over network" am: 349c5720cf am: 8181ca516e am: 924a5e0680 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I3b2027ad8685e9a5ebb7b06da412ab5a3f42ed2b
 2020-07-08 05:16:10 +00:00
Chalard Jean
758d6bd8d0 Merge "Add some more public doc for MacAddress" 2020-07-08 05:15:20 +00:00
Treehugger Robot
924a5e0680 Merge "Skip testPhysicalEthernet if the test run adb over network" am: 349c5720cf am: 8181ca516e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I5e91a05d90f5f05cdbe7e7b30945d80832759bd2
 2020-07-08 05:06:20 +00:00
Treehugger Robot
8181ca516e Merge "Skip testPhysicalEthernet if the test run adb over network" am: 349c5720cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I0d6eb8195743a6318c5adabb26d837ae35236c0d
 2020-07-08 04:54:34 +00:00