Fedor Kudasov
6619c84f7f
Merge "Return NonNull and other imports" into stage-aosp-master
...
am: ee24c6da27
2019-07-09 07:37:52 -07:00
Fedor Kudasov
c064c84b5f
Return NonNull and other imports
...
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
2019-07-09 14:19:04 +00:00
Fedor Kudasov
95cc083588
Merge changes from topic "fix_master_build" am: 2e5319117a
...
am: 8125047183
2019-07-09 06:22:48 -07:00
Fedor Kudasov
8125047183
Merge changes from topic "fix_master_build"
...
am: 2e5319117a
2019-07-09 06:10:01 -07:00
Fedor Kudasov
2e5319117a
Merge changes from topic "fix_master_build"
...
* changes:
Revert "Cherry-pick the relevant parts of master change"
Revert "Remove providesRoutesToMostDestinations."
2019-07-09 09:32:23 +00:00
Fedor Kudasov
559e91e0ef
Revert "Cherry-pick the relevant parts of master change"
...
This reverts commit dd16d44fe8
2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216
Revert "Remove providesRoutesToMostDestinations."
...
This reverts commit d85b09a06f
2019-07-09 09:23:25 +00:00
Neil Fuller
19d4f4eb32
Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a
...
am: 8d96e17940
2019-07-09 01:56:25 -07:00
Neil Fuller
8d96e17940
Merge "Switch widgets away from android.text.format.Time"
...
am: db31e6d07a
2019-07-09 01:38:01 -07:00
Neil Fuller
db31e6d07a
Merge "Switch widgets away from android.text.format.Time"
2019-07-09 08:15:10 +00:00
Chalard Jean
40b8170b09
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c
...
am: cbaed4e7ba
2019-07-09 01:10:24 -07:00
Chalard Jean
cbaed4e7ba
Merge changes Ia43f8811,I7de4f672
...
am: 3ef04b8e3c
2019-07-09 00:56:57 -07:00
Svet Ganov
7922ef60fc
Specify the duration time base
...
am: 6f672a3835
2019-07-08 19:32:25 -07:00
Svet Ganov
6f672a3835
Specify the duration time base
...
Test: N/A
Bug: 128316830
Change-Id: Idd8f1aaf1a8e0013c01fdf4d668f9d5e81101559
2019-07-08 16:40:45 -07:00
Chalard Jean
d85b09a06f
Remove providesRoutesToMostDestinations.
...
This function is not used any more.
Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
2019-07-08 20:36:33 +09:00
Chalard Jean
dd16d44fe8
Cherry-pick the relevant parts of master change
...
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict
Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
2019-07-08 20:25:45 +09:00
Nikita Ioffe
0ad641f9f6
Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}" into stage-aosp-master
...
am: 6a36ad8b7e
2019-07-04 08:48:49 -07:00
Nikita Ioffe
f585ed0459
Use ApexInfo.moduleName
...
See another CL in the topic
Bug: 132428457
Test: builds
Change-Id: I87ba3fb539d0761c515adc8e2d2acc8dfc5e6a9a
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
2019-07-04 15:46:08 +00:00
Adrian Roos
bee24f79f7
Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
...
am: 8ef731c232
2019-07-04 08:07:23 -07:00
TreeHugger Robot
8ef731c232
Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
2019-07-04 14:35:42 +00:00
Adrian Roos
019a52b4ad
WM: implicitly exclude all edges for pre-Q immersive sticky apps
...
Bug: 135522625
Test: atest DisplayContentTests
Change-Id: Ibe6c2c6d269b15c2e79ac0241b93e42c44a167c9
Exempt-From-Owner-Approval: TBR
2019-07-04 14:35:34 +00:00
Matt Pietal
d4f87e905f
Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev
...
am: 914de104b3
2019-07-03 17:37:56 -07:00
Ray Essick
de7e7b1e61
Merge "Revert "Preload sfplugin_ccodec for performance"" into qt-dev
...
am: fb4fab4fa3
2019-07-03 16:55:15 -07:00
Louis Chang
d75d59e276
Merge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev
...
am: ae80cf399a
2019-07-03 16:40:13 -07:00
Matt Pietal
914de104b3
Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev
2019-07-03 20:11:59 +00:00
TreeHugger Robot
fb4fab4fa3
Merge "Revert "Preload sfplugin_ccodec for performance"" into qt-dev
2019-07-03 19:08:42 +00:00
Ray Essick
4a0199a899
Revert "Preload sfplugin_ccodec for performance"
...
This reverts commit 30da74bda4
2019-07-03 18:48:16 +00:00
Nikita Ioffe
b4eee2a17d
Rename ApexInfo.package{Name,Path} to module{Name,Path}
...
This should resolve the confusion between internal name of APEXes that
comes from apex_manifest.json and packageName that comes from
AndroidManifest.xml.
Follow-up CLs:
* Rename package to module for all apexservice binder APIs.
* Rename package to module in apexd codebase.
Test: atest apexservice_test
Test: atest CtsStagedInstallHostTestCases
Bug: 132428457
Change-Id: If0bd3d368c7373ab0028211a8a4246a9821893af
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
(cherry picked from commit ec67395d7d
2019-07-03 14:27:01 +01:00
Matt Pietal
a310c1fa3a
Resolver - 'Always' button broken for non VIEW cases
...
Users are incorrectly being directed to the settings app when
selecting 'Always', making them unable to actually open an app through
the resolver.
Bug: 132071949
Test: Steps are reported in b/136451610
Change-Id: I11775d7b0b780195f08273ad2b90b8ecd2ee1db4
2019-07-03 09:12:56 -04:00
TreeHugger Robot
ae80cf399a
Merge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev
2019-07-03 06:20:07 +00:00
Louis Chang
ea203cdbdf
Avoid making post state to RESUMED for a PAUSING activity
...
Make sure the client post execution lifecycle state to RESUMED
only if the activity was RESUMED while delivering new intent.
Bug: 135715788
Test: making skype calls
Test: atest ActivityThreadTest
Change-Id: I1e3054e1d1611aecf6ddf6d482abf2cb3ebdf9a4
2019-07-03 09:44:12 +08:00
Dmitry Dementyev
45e4f2e836
Merge "Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"" into qt-dev
...
am: 660c234e9a
2019-07-02 12:29:39 -07:00
Dmitry Dementyev
660c234e9a
Merge "Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"" into qt-dev
2019-07-02 19:01:15 +00:00
Winson Chung
1f5a4106d8
Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev
...
am: 1abc45038b
2019-07-02 11:20:08 -07:00
Ray Essick
80643498fe
Merge "Preload sfplugin_ccodec for performance" into qt-dev
...
am: 878a6b2015
2019-07-02 10:38:59 -07:00
Winson Chung
1abc45038b
Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev
2019-07-02 17:37:34 +00:00
Matt Pietal
3d1f220698
Merge "Sharesheet - Fix regression in direct share sorting" into qt-dev
...
am: ac1c8ddcc3
2019-07-02 10:26:37 -07:00
Ray Essick
878a6b2015
Merge "Preload sfplugin_ccodec for performance" into qt-dev
2019-07-02 17:10:33 +00:00
Dmitry Dementyev
40431ae1bc
Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"
...
This reverts commit 8094880025
2019-07-02 03:59:17 +00:00
Nazanin Bakhshi
1ca89a995b
Merge "Add device identifier permission checks to TelephonyPermissions"
2019-07-01 23:26:18 +00:00
Winson Chung
ffc70a68c0
Check that alpha is zero instead of transparent color to decide scrim
...
Bug: 136370711
Test: atest EnsureBarContrastTest
Change-Id: I45c4a81d5e7fe6f99615efca528a623f3830f16a
2019-07-01 22:46:07 +00:00
Matt Pietal
bdbeea28d2
Sharesheet - Fix regression in direct share sorting
...
When mutiple apps share shortcuts and are given to the UI to display,
the ranked order from both the App Prediction Service and the legacy
ranker is inadvertently being discarded. This means that targets the
user almost never uses will now be shown as high priority, causing
confusion and pretty horrible user experience.
Address the issue by adding in a score for shortcuts, based on the
index in the ordered list.
Bug: 136201796
Test: atest ChooserActivityTest and manually compare results from
AppPredictionService to verify order is consistent
Change-Id: I1fe2c2d2e13195f6f6c3a5818fade4844c15488e
2019-07-01 16:52:52 -04:00
Michael Groover
94672cea7c
Add device identifier permission checks to TelephonyPermissions
...
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Lorenzo Colitti
736194dfbf
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
...
am: 10c1a704c0
2019-06-29 02:01:55 -07:00
Eugene Susla
2f27997760
[DO NOT MERGE] Guard against launching permission backup/restore twice per request
...
am: 8c2fb0ea1e
2019-06-28 20:42:01 -07:00
TreeHugger Robot
40c5864445
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
2019-06-29 02:56:35 +00:00
Shuzhen Wang
6f14111467
Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
...
am: 6da414a8f6
2019-06-28 17:48:51 -07:00
Eugene Susla
8c2fb0ea1e
[DO NOT MERGE] Guard against launching permission backup/restore twice per request
...
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.
Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
2019-06-29 00:20:09 +00:00
TreeHugger Robot
6da414a8f6
Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
2019-06-28 23:54:09 +00:00
Mathew Inwood
cd82f9adff
Merge "Restore some greylist entries." into qt-dev
...
am: f4535c8d51
2019-06-28 13:18:30 -07:00
