Automerger Merge Worker
f012c5eef7
Merge "Use status_bar_padding_top in QS system icons" into qt-qpr1-dev am: 42e5ebf0f9
...
Change-Id: Ic6b311288bc38ce1d54e060002972ac74311a66a
2020-02-28 19:24:58 +00:00
TreeHugger Robot
42e5ebf0f9
Merge "Use status_bar_padding_top in QS system icons" into qt-qpr1-dev
2020-02-28 19:08:44 +00:00
Matt Pietal
e4beb133e6
Merge changes I7ac3a378,Id06a24d2 into rvc-dev
...
* changes:
Controls API - Docs + method name change
Controls API - Publisher change - Phase 2
2020-02-28 19:06:28 +00:00
Peter Wang
879f32b1cc
Merge "[API Review] Expose sendOrderedBroadcast" into rvc-dev
2020-02-28 19:05:26 +00:00
Fabian Kozynski
f482c100db
Merge "Use the correct user context in CustomTile" into rvc-dev
2020-02-28 19:05:17 +00:00
Jovana Knezevic
a0eed34ecb
Merge "Fixes switch-user -w command." into rvc-dev
2020-02-28 19:04:15 +00:00
Ruchir Rastogi
06d2fe8d83
Merge "Fix LogEventQueue_tests" into rvc-dev
2020-02-28 18:20:07 +00:00
TreeHugger Robot
c8bb1b3286
Merge "Prevent NPE in CustomTile" into rvc-dev
2020-02-28 18:01:02 +00:00
TreeHugger Robot
97ce4799af
Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev
2020-02-28 17:43:40 +00:00
Dmitri Plotnikov
9e0ea0c953
Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev
2020-02-28 17:29:13 +00:00
Jay Aliomer
b86cf15c28
Merge "Battery saver dark mode bug" into rvc-dev
2020-02-28 17:01:39 +00:00
Zhen Zhang
d113c5e037
Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev
2020-02-28 16:59:05 +00:00
Heemin Seog
dfb1fe98af
Merge "Generalize AutoHideController to be shared" into rvc-dev
2020-02-28 16:55:28 +00:00
Sarah Chin
6c8486c771
Merge changes from topic "cp-networkscan-optimize" into rvc-dev
...
* changes:
Remove NetworkClass from TelephonyManager
Add Network Preference Bitmaps
2020-02-28 16:48:41 +00:00
Hongwei Wang
bfdc669666
Merge "Updates destination bounds upon rotation change" into rvc-dev
2020-02-28 16:47:07 +00:00
Hongwei Wang
1a7d51051e
Merge "Fixed the GMM PiP window size" into rvc-dev
2020-02-28 16:46:51 +00:00
TreeHugger Robot
b94fdf54c2
Merge "Ignore flaky test" into rvc-dev
2020-02-28 16:38:42 +00:00
TreeHugger Robot
20905ec041
Merge "Fix testScreenCaptureDisabled" into rvc-dev
2020-02-28 15:54:52 +00:00
Miranda Kephart
aef754d253
Merge "Fix bug where screenshot jumped to the left" into rvc-dev
2020-02-28 15:31:55 +00:00
Shafik Nassar
ab2132d460
Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev
2020-02-28 15:30:58 +00:00
Derek Sollenberger
8cf381064f
Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev
2020-02-28 15:24:02 +00:00
Julia Reynolds
b2c82a055e
Merge changes Ic91ff7ac,I7d118592 into rvc-dev
...
* changes:
Fix some more snoozing bugs
Silence notifications that are manually unsnoozed
2020-02-28 15:22:20 +00:00
Beverly
91fbdbb99c
Ignore flaky test
...
Bug: 149046729
Test: atest NotificationRankingManagerTest
Change-Id: I76049c050cc760faf773ca15cb1a90700b031231
2020-02-28 09:52:55 -05:00
TreeHugger Robot
881b688f68
Merge "Fix CTS tests" into rvc-dev
2020-02-28 14:50:41 +00:00
Will Brockman
8e41d8ce3c
Merge "Statsd: modules for notifications atoms." into rvc-dev
2020-02-28 14:26:59 +00:00
Alex Johnston
bb1d2a931b
Fix testScreenCaptureDisabled
...
* A SecurityException was being thrown because getProfiles
in UserManager cannot be called by the COPE PO for user 0
without permission MANAGE_USERS or CREATE_USERS.
* Added binderWithCleanCallingIdentity to this method.
Bug: 149941985
Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testScreenCaptureDisabled
Change-Id: Iccc60233baaeaa732f197d7aaf31acc9d75a247b
Merged-In: Iccc60233baaeaa732f197d7aaf31acc9d75a247b
(cherry picked from commit 2797594914 )
2020-02-28 14:00:16 +00:00
Adrian Roos
ee540c3245
Merge "PhoneWindow: Fix potential memory leak" into rvc-dev
2020-02-28 13:58:48 +00:00
TreeHugger Robot
936c61aa31
Merge "Fix copy-pasted documentation." into rvc-dev
2020-02-28 13:32:43 +00:00
Patrick Baumann
da9de09a2c
Merge "Calculates visibility in queryIntent* methods" into rvc-dev
2020-02-28 13:14:05 +00:00
Santiago Seifert
51e12d6c29
Fix CTS tests
...
Broken since behavioral parameters were added.
Test: CTS.
Bug: 150321580
Bug: 147308781
Bug: 149906115
Change-Id: I8629a78e547cba3552bcc73c0dd55b9317611156
2020-02-28 12:54:19 +00:00
TreeHugger Robot
2523db7c3f
Merge "Do not go home when status bar collapse is requested." into rvc-dev
2020-02-28 12:03:58 +00:00
Julia Reynolds
66db87d0c0
Merge "Show snoozed conversations in conversation header" into rvc-dev
2020-02-28 11:46:33 +00:00
TreeHugger Robot
8f034348ca
Merge "Update section header placement logic" into rvc-dev
2020-02-28 11:46:28 +00:00
TreeHugger Robot
fde0af9177
Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev
2020-02-28 11:38:39 +00:00
Eran Messeri
3f9578be3e
Fix copy-pasted documentation.
...
Fix the documentation for USE_INDIVIDUAL_ATTESTATION which was
copy-pasted from another attestation ID type.
Bug: 149475774
Test: That it compiles.
Change-Id: I9366870c8875997321c93fe1db216e91f374b1db
2020-02-28 11:32:33 +00:00
TreeHugger Robot
f43e6bc49d
Merge "Restrict app transition maximum duration" into rvc-dev
2020-02-28 11:17:34 +00:00
Robin Lee
eff035d996
Do not go home when status bar collapse is requested.
...
This is only invoked from CTS and related tests. Some of these tests
attempt to launch an activity and then close the status bar in the
setup step. This exits the activity and is not desired.
Test: atest GtsIncidentManagerTestCases
Test: atest CtsAutoFillServiceTestCases
Bug: 150404191
Change-Id: Ic988c537dfbb72b6eac2dc3885bb832848f8df17
2020-02-28 09:52:48 +00:00
Hyundo Moon
899535c9ff
Make MediaRouter2 callback classes as abstract
...
This is per API review.
Bug: 149912538
Test: Ran CTS and atest mediaroutertest
Change-Id: Id52bb7b06da4f414099607b1bde781005e47ded3
2020-02-28 18:27:42 +09:00
TreeHugger Robot
36a845dee4
Merge "Make libstatssocket shared" into rvc-dev
2020-02-28 08:56:00 +00:00
Hongwei Wang
ea2ae858d0
Updates destination bounds upon rotation change
...
This would be a bug for any PiP-enabled application if the preferred
fullscreen is in a different screen rotation than in PiP mode.
Bug: 150360003
Test: atest PinnedStackTests
Test: manually enter/exit PiP w/ Play movies app
Change-Id: Ibb56d907b9968eaf90171315faa6181a7e72b146
2020-02-27 22:41:59 -08:00
Winson Chiu
a57109b660
Merge "Skip no-state checkUseInstalled check inside PackageInfoUtils" into rvc-dev
2020-02-28 06:31:06 +00:00
JW Wang
f8d52afa16
Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev
...
* changes:
Remove unused code (3/n)
Use session id to search for rollbacks (2/n)
Include session id when sending broadcasts (1/n)
2020-02-28 06:29:00 +00:00
lumark
8669ef3857
Restrict app transition maximum duration
...
As WindowState#startAnimation for restricting window animation duration
(currently is 10 secs),
For security reason, we also need to restrict app transition animation
duration as 3 secs to prevent malicious app may set a long duration or
infinity repeat counts through ActivityOption#makeCustomAnimation or
Activity#overridePendingTransition with custom animation set.
Bug: 145728687
Test: manual as issue provided test app
Change-Id: I39051d6e4d2b681ce2becbafe14aab3f3d8ebf6b
2020-02-28 14:06:55 +08:00
TreeHugger Robot
3e7dd91752
Merge "Use median instead of mean for sampling border luma" into rvc-dev
2020-02-28 05:08:52 +00:00
TreeHugger Robot
ca51ab418f
Merge "[Passpoint] Allow profile installations with no Root CA certificate" into rvc-dev
2020-02-28 04:54:59 +00:00
Ady Abraham
8a5e39174f
DisplayModeDirector: use configGroup when choosing default config
...
When calling to SurfaceFlinger to set the display config spec, the
default configId needs to consider the config group of the config.
Bug: 149784270
Test: Simulate multiple config with debug change ag/10355181
Change-Id: I50dce6e31e8cc842a221baaa69e128428f67be99
2020-02-28 04:35:51 +00:00
TreeHugger Robot
08f6ca3915
Merge "Prevent start if package is frozen" into rvc-dev
2020-02-28 04:24:30 +00:00
Roshan Pius
f5360ee034
Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev
2020-02-28 03:36:22 +00:00
Roshan Pius
b3b559f167
Settings(javadocs): Add alternatives for deprecated settings
...
Bug: 150219394
Test: Compiles
Change-Id: Ie4dfbfa640a042343e20d2238729444fdc8eadb6
2020-02-28 03:35:12 +00:00
TreeHugger Robot
71c8e9a0a3
Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev
2020-02-28 03:30:33 +00:00