Automerger Merge Worker
3568f17c74
Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d
...
Change-Id: I73e836c45743f96f966f9c9beaad2e8a7302ca68
2020-02-28 15:47:41 +00:00
Automerger Merge Worker
bf43824b27
Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e am: d3077295c9
...
Change-Id: If233dcb27be80d2b451d2487f62c750f3adf30d8
2020-02-28 15:46:50 +00:00
Automerger Merge Worker
04a79624d9
Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253
...
Change-Id: Ia84ea80abed0a81067057b56b3c5af0b03e459c0
2020-02-28 15:34:35 +00:00
Automerger Merge Worker
beb6c65e77
Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460
...
Change-Id: I832df1eddba66f49406e1242a70d69274ace3c18
2020-02-28 15:34:12 +00:00
Automerger Merge Worker
a161f3f17d
Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f
...
Change-Id: Ie39564c888e86cd903dbb1c767f2780eb28b23df
2020-02-28 15:34:01 +00:00
Automerger Merge Worker
d3077295c9
Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e
...
Change-Id: I1a40d0bca2e42a6632896298724a0b115046c079
2020-02-28 15:33:54 +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
Automerger Merge Worker
c69289879a
Merge "Fix CTS tests" into rvc-dev am: 881b688f68 am: 2402bf11fd
...
Change-Id: Id0caffd905547c26125e79b1e53f34d321f44707
2020-02-28 15:22:41 +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
Automerger Merge Worker
2402bf11fd
Merge "Fix CTS tests" into rvc-dev am: 881b688f68
...
Change-Id: I7d588274ab732da753d3204233a4f9e8fbae1af0
2020-02-28 15:07:05 +00:00
Automerger Merge Worker
1c41f4b158
Merge "Statsd: modules for notifications atoms." into rvc-dev am: 8e41d8ce3c am: 515725a66f
...
Change-Id: Id81bcc09497acab23ebb900c5a6d2ef1b8780c1d
2020-02-28 15:00:48 +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
Automerger Merge Worker
515725a66f
Merge "Statsd: modules for notifications atoms." into rvc-dev am: 8e41d8ce3c
...
Change-Id: I66195114a1f87eb886180ed48a93f5382aed99b9
2020-02-28 14:43:12 +00:00
Automerger Merge Worker
cf0d808cf8
Merge "PhoneWindow: Fix potential memory leak" into rvc-dev am: ee540c3245 am: 8d0a2cfa51
...
Change-Id: I9d2b4645de389058753ef2e998811a7e81a3bc8a
2020-02-28 14:28:39 +00:00
Will Brockman
8e41d8ce3c
Merge "Statsd: modules for notifications atoms." into rvc-dev
2020-02-28 14:26:59 +00:00
Automerger Merge Worker
8d0a2cfa51
Merge "PhoneWindow: Fix potential memory leak" into rvc-dev am: ee540c3245
...
Change-Id: I52718dc154a699eca84d841d8a49fd6d3e1d3707
2020-02-28 14:13:43 +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
Automerger Merge Worker
4dc26c6bbe
Merge "Fix copy-pasted documentation." into rvc-dev am: 936c61aa31 am: ca49c8166b
...
Change-Id: Icd15d0d438c6db47ad3499127796c35819d27be7
2020-02-28 13:56:46 +00:00
Automerger Merge Worker
d3de555fea
Merge "Calculates visibility in queryIntent* methods" into rvc-dev am: da9de09a2c am: 47ed480c01
...
Change-Id: I6f1c6e9b29ae75a69da8f6954d900be0d2b1494e
2020-02-28 13:56:26 +00:00
Automerger Merge Worker
ca49c8166b
Merge "Fix copy-pasted documentation." into rvc-dev am: 936c61aa31
...
Change-Id: I6022b2b3732ccb4c39d53465910370dc3ff22a4a
2020-02-28 13:37:47 +00:00
Automerger Merge Worker
47ed480c01
Merge "Calculates visibility in queryIntent* methods" into rvc-dev am: da9de09a2c
...
Change-Id: I5746a31bdc8db6e3e3e410cb7c48afb6761941cb
2020-02-28 13:37:08 +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
Automerger Merge Worker
fc5bd38123
Merge "Do not go home when status bar collapse is requested." into rvc-dev am: 2523db7c3f am: 8a90f4a998
...
Change-Id: Icb20b64b1417ccd5d31306a87dfa316a18af796c
2020-02-28 12:34:18 +00:00
Automerger Merge Worker
8a90f4a998
Merge "Do not go home when status bar collapse is requested." into rvc-dev am: 2523db7c3f
...
Change-Id: I1b7832d48bf737a2db6f1dc12ad085d4ba930dc7
2020-02-28 12:21:10 +00:00
Automerger Merge Worker
a1c57cff01
Merge "Show snoozed conversations in conversation header" into rvc-dev am: 66db87d0c0 am: 7d3b6fa67e
...
Change-Id: If5967ed5e904b586a7aed61a28e0c1fd2c337fb3
2020-02-28 12:09:51 +00:00
Automerger Merge Worker
6a8ffabac2
Merge "Update section header placement logic" into rvc-dev am: 8f034348ca am: 5fddf61e9e
...
Change-Id: I492ebc60bf0a5358b50127505aaa003c26fefffa
2020-02-28 12:09:30 +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
Automerger Merge Worker
7d3b6fa67e
Merge "Show snoozed conversations in conversation header" into rvc-dev am: 66db87d0c0
...
Change-Id: I11767eccc77fbf4156cef6ff42f99c68f867a77d
2020-02-28 11:56:32 +00:00
Automerger Merge Worker
5fddf61e9e
Merge "Update section header placement logic" into rvc-dev am: 8f034348ca
...
Change-Id: Idc354482347c7c80cc51df9a74dc519384b90618
2020-02-28 11:55:50 +00:00
Automerger Merge Worker
7c8304e374
Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177 am: c465a33021
...
Change-Id: I68deab661678d34c5d5b626a04c211b4805070e6
2020-02-28 11:47:26 +00:00
Automerger Merge Worker
3058d24fd8
Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc49d am: a14a3d3d2a
...
Change-Id: I5ffca72dfa0c2229112bf8138f64bc7d0bc4f3e7
2020-02-28 11:47:16 +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
Automerger Merge Worker
c465a33021
Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177
...
Change-Id: I73c2b0976fc0b42083d043e43138fcbf10f51b8e
2020-02-28 11:41:30 +00:00
TreeHugger Robot
fde0af9177
Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev
2020-02-28 11:38:39 +00:00
Automerger Merge Worker
a14a3d3d2a
Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc49d
...
Change-Id: Ie74c2bc79718b7788b7b615b161d4c6c8d1d2cde
2020-02-28 11:35:55 +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
Winson
9a2b1b350a
Use PackageInfoUtils with null PackageSetting to set server-only flags
...
PackageImpl on the server side contains fields that are system server
specific, such as what partition the package was found on. These
fields are hidden from the core side, since they're irrelevant
for APKs that are not processed by PackageManagerService.
To mirror this, only the server side PackageInfoUtils sets the
flags related to theses server-side fields.
So when a PackageSetting is created, this server-side
PackageInfoUtils must be called, not the core side
PackageInfoWithoutStateUtils, with a null PackageSetting,
to set the related pkg(Private)Flags.
Bug: 150083410
Test: atest android.cts.backup.OtherSoundsSettingsHostSideTest
Test: atest com.android.server.pm.parsing
Change-Id: Ife39c83e243daf5d3583f04fce1c0f87c0e20585
2020-02-28 02:42:14 -08: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
Automerger Merge Worker
8f74209ce6
Merge "Make libstatssocket shared" into rvc-dev am: 36a845dee4 am: e09c6ba695
...
Change-Id: I261480eb542849538d2ab3151b556a50c55a6e56
2020-02-28 09:28:57 +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
Automerger Merge Worker
e09c6ba695
Merge "Make libstatssocket shared" into rvc-dev am: 36a845dee4
...
Change-Id: I013e59fb7f008ce21c1320fcd1d5d95a9ec29da8
2020-02-28 09:14:59 +00:00
TreeHugger Robot
36a845dee4
Merge "Make libstatssocket shared" into rvc-dev
2020-02-28 08:56:00 +00:00