Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
407,291 Commits 3 Branches 0 Tags
7209010cc1e93720c5f6c44ce910987a410ef196
Commit Graph

407291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Kozynski
7209010cc1 Fixes NPE in list from PrivacyItemController 
NPE is probably caused by concurrent modification of the variable. Added
guards to prevent concurrent modification.

Test: current tests passing
Fixes: 127138070
Change-Id: I19220c2123bcc1b1a759e2a01592dde1bcd1316f
 2019-03-05 09:36:58 -05:00
Andrei-Valentin Onea
63727e269b Merge "Add target for generating aidl mappings" 2019-03-04 15:54:35 +00:00
Wyatt Riley
3005a80e5f [automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f am: 21c4a58435 am: 499b803c52 -s ours am: 3148adad10 
am: 769c42790b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc4db3d1f31b55bbbd66e9107852856fc0fc2a9e
 2019-03-04 07:38:46 -08:00
WyattRiley
37f10c9ae4 [automerger skipped] [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c am: cf81345649 am: 94029593c4 am: c03d767ee8 -s ours am: 74bc239b24 
am: 659ca0ac61 -s ours
am skip reason: subject contains skip directive

Change-Id: I931b77c0ee018368130e888c07e9cfa9571c9b13
 2019-03-04 07:37:01 -08:00
TreeHugger Robot
ab916e39be Merge "Add the check for UID presence to Display#hasAccess()" 2019-03-04 15:33:58 +00:00
Wyatt Riley
769c42790b [automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f am: 21c4a58435 am: 499b803c52 -s ours 
am: 3148adad10

Change-Id: If0f54b753c80f432cd79b98228f5ad1566a34049
 2019-03-04 07:32:06 -08:00
WyattRiley
659ca0ac61 [automerger skipped] [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c am: cf81345649 am: 94029593c4 am: c03d767ee8 -s ours 
am: 74bc239b24

Change-Id: I95cd263ab1dc2854bc5cf7a008532397ad08b06b
 2019-03-04 07:21:37 -08:00
Wyatt Riley
3148adad10 [automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f am: 21c4a58435 
am: 499b803c52 -s ours
am skip reason: subject contains skip directive

Change-Id: I4771454a5cdfdd6641983f438139a97f216cec5c
 2019-03-04 07:18:55 -08:00
Android Build Merger (Role)
792c2cfe8a Merge "Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f024 am: 08bc717117 am: 5317912537" 2019-03-04 15:18:18 +00:00
Slava Shklyaev
ae68d85fc3 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f024 am: 08bc717117 
am: 5317912537

Change-Id: Idab2d4174aa3d6a19f9573edf0d5ee3ecfa33201
 2019-03-04 07:17:43 -08:00
Jorim Jaggi
6cec15b859 Merge "Nuke mActivitiesWaitingForVisibleActivity" 2019-03-04 15:14:48 +00:00
Wyatt Riley
499b803c52 Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f 
am: 21c4a58435

Change-Id: I3d4e666268ac37f41c6d94e10f5e5e1f2928ef7f
 2019-03-04 07:11:25 -08:00
WyattRiley
74bc239b24 [automerger skipped] [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c am: cf81345649 am: 94029593c4 
am: c03d767ee8 -s ours
am skip reason: subject contains skip directive

Change-Id: If7999e30c065ed880e9c105c5ecb661cd8c8d79e
 2019-03-04 07:07:55 -08:00
Slava Shklyaev
5317912537 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f024 
am: 08bc717117

Change-Id: I32ab3dfc2f403c552672d77dc77d2c768536bec3
 2019-03-04 07:07:51 -08:00
WyattRiley
c03d767ee8 [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c am: cf81345649 
am: 94029593c4

Change-Id: I816c914fd79f9589efa0e6b587649cd6264113bc
 2019-03-04 07:02:56 -08:00
Slava Shklyaev
08bc717117 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" 
am: 0bbf61f024

Change-Id: I3f3572a23021ab173b38c3f04c43d8eb37706c26
 2019-03-04 06:56:51 -08:00
Wyatt Riley
21c4a58435 Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev 
am: 809231680f

Change-Id: If2f27dd775d4d5d543d23d10dcce10bc1bc4f51a
 2019-03-04 06:56:23 -08:00
Wyatt Riley
dd681ee707 [automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev am: 598118ffe1 
am: 17bf9f9e42 -s ours
am skip reason: subject contains skip directive

Change-Id: I463b9f8c1608528810c757f5fd4d4de3dc250857
 2019-03-04 06:55:51 -08:00
WyattRiley
94029593c4 [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c 
am: cf81345649

Change-Id: I8f2f2edaaa607378d75e3c852d0b8cedbc4fbb67
 2019-03-04 06:51:02 -08:00
Wyatt Riley
17bf9f9e42 Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev 
am: 598118ffe1

Change-Id: Ia1899036cb0c1f0f63b7f1cd97d6f1418c0e5614
 2019-03-04 06:51:01 -08:00
Slava Shklyaev
0bbf61f024 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" 2019-03-04 14:42:17 +00:00
Slava Shklyaev
2fac9dd3d4 Revert "Revert "Revert "Correct nullability and final constraints on new APIs.""" 
This reverts commit b255be1307.

Reason for revert: the commit being reverted fixed git_master but broke aosp-master. This revert is aimed to fix aosp-master while not touching git_master.

DO NOT MERGE: This change is aimed at aosp-master only and should not be merged into git_master.

Change-Id: Ie5aaabb211affe2d21daaf87809641276d9d4707
 2019-03-04 14:39:56 +00:00
Wyatt Riley
598118ffe1 Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev 2019-03-04 14:29:06 +00:00
Wyatt Riley
809231680f Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev 2019-03-04 14:29:06 +00:00
Wyatt Riley
4891313d16 Merge "SUPL ES Extension - Safer Init and Not After Boot" 2019-03-04 14:29:06 +00:00
Fabian Kozynski
2a63f2136f Merge "Theming for Device Management Dialog" 2019-03-04 14:03:48 +00:00
Fabian Kozynski
f6ce237ad0 Merge "Makes third party tiles inactive when they are new" 2019-03-04 14:03:26 +00:00
Olivier Gaillard
2602d4abe7 Merge "Decreases the maximum cardinality of binder/looper stats." 2019-03-04 13:54:19 +00:00
Andrei Onea
7a2985c3ca Add target for generating aidl mappings 
Test: make aidl-mappings
Change-Id: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
 2019-03-04 13:51:36 +00:00
Neil Fuller
59d51978e3 [automerger skipped] Merge "Use new libcore filegroup variable" am: 898caeeaed am: 458d16bced 
am: ddd7d4e981 -s ours
am skip reason: change_id I72667f30dc5685fdc24aca3f8ee82b20c7548449 with SHA1 3b1b70376c is in history

Change-Id: I8a6d8920ffdfe9976b157f671ff32047e171c52a
 2019-03-04 04:56:16 -08:00
Jorim Jaggi
9b5e331457 Nuke mActivitiesWaitingForVisibleActivity 
Instead of relying on this brittle architecture we just check
whether the animation has finished. Much cleaner now :-)

Test: Swipe up to recents from Chrome, relaunch in the right
moment. Observe no jumpcut.
Test: Existing lifecycle tests should cover this
Test: android.server.am.lifecycle: All passed!
Bug: 111227410
Change-Id: I83b3dc0e026e842bf260a376ce9a57afd1b01d9f
 2019-03-04 13:53:38 +01:00
Neil Fuller
ddd7d4e981 Merge "Use new libcore filegroup variable" am: 898caeeaed 
am: 458d16bced

Change-Id: I692b7bfbc5e7bdd8b44e26d2d55862bf725d141b
 2019-03-04 04:46:28 -08:00
Andrei-Valentin Onea
52f7220a06 Merge "Add @UnsupportedAppUsage annotations" 2019-03-04 12:42:01 +00:00
Slava Shklyaev
fc291d1ed1 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" am: 86e2035208 am: 6ced2f195d 
am: 8e6b20f4f3

Change-Id: I0aa41b4fc5d08201deffccdaa25c50ae7942fe78
 2019-03-04 04:40:09 -08:00
Neil Fuller
458d16bced Merge "Use new libcore filegroup variable" 
am: 898caeeaed

Change-Id: Ib5ff380f043b31b45b4b5ef0c9593e456b656378
 2019-03-04 04:37:29 -08:00
Adam Vartanian
f15b8a042d Merge "Add @Nullable to new method" am: 70c0efdd86 am: 2948be98c2 
am: a343750304

Change-Id: I743d3fae43073eebf1a9abecd45fe71456f4ab43
 2019-03-04 04:19:34 -08:00
Slava Shklyaev
8e6b20f4f3 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" am: 86e2035208 
am: 6ced2f195d

Change-Id: I4e4304d169a2f7fc4c772d0170f9b1f5cc7e8fb0
 2019-03-04 04:18:13 -08:00
Neil Fuller
898caeeaed Merge "Use new libcore filegroup variable" 2019-03-04 12:14:59 +00:00
Adam Vartanian
a343750304 Merge "Add @Nullable to new method" am: 70c0efdd86 
am: 2948be98c2

Change-Id: I6f73879bd791af4ce2e0f6669a2d39f3648a5595
 2019-03-04 04:10:20 -08:00
Slava Shklyaev
6ced2f195d Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" 
am: 86e2035208

Change-Id: I345e3f33e518373f787c0fb2c786a513e2dccd7d
 2019-03-04 04:09:02 -08:00
Adam Vartanian
2948be98c2 Merge "Add @Nullable to new method" 
am: 70c0efdd86

Change-Id: I1e2f40e60dfb55810d7978cd00f91411ed91fa5a
 2019-03-04 03:56:59 -08:00
Slava Shklyaev
86e2035208 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" 2019-03-04 11:49:34 +00:00
Slava Shklyaev
b255be1307 Revert "Revert "Correct nullability and final constraints on new APIs."" 
This reverts commit 8462c66bd5.

Reason for revert: Looks like this change broke the build.

Change-Id: I4cff1ec1211e278d5e5734f1594c096722293662
 2019-03-04 11:47:11 +00:00
Treehugger Robot
70c0efdd86 Merge "Add @Nullable to new method" 2019-03-04 11:43:48 +00:00
TreeHugger Robot
5766681ae5 Merge "Only show smart actions for whitelisted apps in lock task mode." 2019-03-04 11:38:18 +00:00
TreeHugger Robot
f278d267f5 Merge "Change default values for thread collection" 2019-03-04 10:53:00 +00:00
Mark Chien
8ffa43d20d Merge "Return not supported if no necessary socket option" am: 69ae441fa1 am: da7ef3c063 
am: d6b2dc39ee

Change-Id: I46918a026f547ebd8a001a1e4dba2881cf6dd134
 2019-03-04 01:46:47 -08:00
Mark Chien
d6b2dc39ee Merge "Return not supported if no necessary socket option" am: 69ae441fa1 
am: da7ef3c063

Change-Id: I58b49eab495b6b949368f86f5dd32bfc507d4141
 2019-03-04 01:37:26 -08:00
Mark Chien
da7ef3c063 Merge "Return not supported if no necessary socket option" 
am: 69ae441fa1

Change-Id: I592d08040459e544a53861b4e8a0ee49a50f225b
 2019-03-04 01:28:12 -08:00
Mark Chien
69ae441fa1 Merge "Return not supported if no necessary socket option" 2019-03-04 09:16:07 +00:00