Commit Graph

18547 Commits

Author SHA1 Message Date
Charles Chen
a8eb5da27e Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567 am: c1ee356ca6 am: ab67c20603 am: 6eac042d97
Change-Id: I2e4b08ed2e61a9e0039619341f83e3a573a2b5e4
2020-05-30 07:40:50 +00:00
Charles Chen
ab67c20603 Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567 am: c1ee356ca6
Change-Id: I3439185307f11b96449886d60754928487b39bb9
2020-05-30 07:11:45 +00:00
Charles Chen
13e3568567 Merge "Fix get display from display context derived context not working" into rvc-dev 2020-05-30 06:35:35 +00:00
Charles Chen
e22c4cb3c6 Fix get display from display context derived context not working
In ContextImpl, we checked the flag "mIsAssociatedWithDisplay" to
identify if a context can access a display or not. The flag wasn't
passed from outer context, and it leads to an issue that context
which created from #createConfigurationContext from display context
failed to obtain display instance.

This CL passes mIsAssociatedWithDisplay from outer context and
also add test to verify the behavior.

fixes: 157719118
Test: atest ContextTest ContextAccessTest

Change-Id: Ibeb2a08c75f90304e12dcf99293c84409c5eea34
2020-05-30 12:46:59 +08:00
Robin Lee
90cfc39370 Remove dead code: TV-specific launchAssistIntent
Leanback devices go through the regular assist launch path now
so this workaround code is dead.

Test: make checkbuild
Bug: 157564688
Change-Id: I625c1ca03df9350f181219fe87d0d0c4f1e56e0f
2020-05-29 11:38:45 +00:00
TreeHugger Robot
e84c95eaf3 Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510 am: cd991f9b3c am: 6084e4c0ad am: 7d4b99d7cd
Change-Id: Ibadba7c89591345e8e6990cf4d41b834737295cd
2020-05-29 05:21:59 +00:00
TreeHugger Robot
7d4b99d7cd Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510 am: cd991f9b3c am: 6084e4c0ad
Change-Id: I81f584b0896136b8fc31632a1a5ff7b4f1359349
2020-05-29 05:09:29 +00:00
TreeHugger Robot
f7bb82a829 Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510
Change-Id: I747167bf3e361bf0a8ac6f547b66babaf4398350
2020-05-29 04:48:34 +00:00
TreeHugger Robot
9aa8852510 Merge "Fix transition return issues when more than 1 level depth" into rvc-dev 2020-05-29 04:32:46 +00:00
TreeHugger Robot
d6c0f2d342 Merge "Add AndroidFrameworkClientSidePermissionCheck errorprone check" 2020-05-28 22:44:37 +00:00
Hongwei Wang
0629b9772f Merge "Set isInPictureInPictureMode earlier" into rvc-dev am: 3da602b640 am: d1bc4769ac am: 7b8b330d2a am: 0604285c4b
Change-Id: Ia79a39232f8d7545be9d54ea39bd73dc8eef74bf
2020-05-28 21:39:07 +00:00
Bernardo Rufino
5a2df65f5a Add AndroidFrameworkClientSidePermissionCheck errorprone check
Often a permission check in the app's process is an indicative of a
security issue since the app could work around it. Permission checks
should be done on system_server.

This errorprone warning checks for invocations of
Context.checkPermission() in any class inside android.app package and
emits a warning if it finds one. I also added a @SuppressWarnings for
one such call that has a todo and it and seems like an already tracked
workaround. The other call found by the checker is tracked in
b/157548188.

I also found that errorprone was not running for framework-minus-apex,
so I added the plugin to the relevant build rule. Let me know if this is
not the way to go!

Test: build/soong/soong_ui.bash --make-mode framework-minus-apex
      RUN_ERROR_PRONE=true
Bug: 157626959
Change-Id: Ieb94f2f43722837c8354ac66474797f4f338ae16
2020-05-28 22:00:53 +01:00
Hongwei Wang
d1bc4769ac Merge "Set isInPictureInPictureMode earlier" into rvc-dev am: 3da602b640
Change-Id: Ib8f177257139994942df787a1f93cd5b06bd130b
2020-05-28 20:59:34 +00:00
Hongwei Wang
e37b84d19e Set isInPictureInPictureMode earlier
Per https://developer.android.com/guide/topics/ui/picture-in-picture
After app requests enterPictureInPictureMode and receives onPause
callback, it will continue playback if isInPictureInPictureMode is true.

However, with ag/11273366, isInPictureInPictureMode will now return true
after the new configuration is dispatched to app, which happens after onPause.
This may cause app, following the guidance, to cease playback in PiP mode.

Fixes this by setting the internal mIsInPictureInPictureMode earlier
right in enterPictureInPictureMode

Video: http://go/recall/-/aaaaaabFQoRHlzixHdtY/fVRqG7UWoKkQQhFxPkzcUt
Bug: 156924033
Test: manually enter PiP from Twitch
Change-Id: I8e0865076fcb756cfa5db39901f460ab5ad69b99
2020-05-28 11:41:39 -07:00
Jeff Chang
6d834d86fb Fix transition return issues when more than 1 level depth
d85bed510, Adding support for cross-task hero transition, When running
cross-task, only play the enter animation, but the judgment for start
exit transition with shared element is broken. For the case on the issue,
when the exit transition completes, the activity is on the top of task,
it is not allowed to execute return transition.

This CL modifies the condition to allow the return transition. For start
exit back transition, the isReturning is always true. We can use it to
decide if it is allowed to play the return transition.

Bug: 137838129
Test: atest ActivityTransitionTest
      Manual testing on ApiDemos with Activity transition

Change-Id: Iaa6a875dbe305f6356887616b797dc45e76a4b56
2020-05-28 18:00:43 +08:00
TreeHugger Robot
f22b790260 Merge "Restrict some OpEntry#* methods for apps targeting R." 2020-05-28 09:47:27 +00:00
TreeHugger Robot
a00402bb70 Merge "Remove InstantAppResolverTests for migration to CTS" into rvc-dev am: f37b09335f am: 38a9ac0ff4 am: 538f254eec am: a9196432f5
Change-Id: Ifd8ca2bb20d50a7011d03bf876c00775a00f8cf7
2020-05-28 01:29:26 +00:00
TreeHugger Robot
a9196432f5 Merge "Remove InstantAppResolverTests for migration to CTS" into rvc-dev am: f37b09335f am: 38a9ac0ff4 am: 538f254eec
Change-Id: I3b694a86cb51bb019993de0ac3710a3a0322928e
2020-05-28 01:10:06 +00:00
TreeHugger Robot
bdfa8f11d7 Merge "Remove InstantAppResolverTests for migration to CTS" into rvc-dev am: f37b09335f
Change-Id: I7b58b9f4dee9a0b84f2a6af793ffa0fe1ce7e8a3
2020-05-28 01:05:25 +00:00
TreeHugger Robot
f37b09335f Merge "Remove InstantAppResolverTests for migration to CTS" into rvc-dev 2020-05-28 00:23:16 +00:00
Julia Reynolds
b39d72b8a6 Merge "Clarify conversation policy" into rvc-dev am: 1e8ce29af7 am: 8dc7491d51 am: 1075523e84 am: 1c6b59868a
Change-Id: I23a846a71354c9c6eb26234ac6206820294590e2
2020-05-27 21:38:47 +00:00
Julia Reynolds
1c6b59868a Merge "Clarify conversation policy" into rvc-dev am: 1e8ce29af7 am: 8dc7491d51 am: 1075523e84
Change-Id: Id090a288435134f7fe8ab50ed58ee2b0d44419ed
2020-05-27 21:18:41 +00:00
Julia Reynolds
fc4a4fc109 Merge "Clarify conversation policy" into rvc-dev am: 1e8ce29af7
Change-Id: If75661d756fd67171050e5a434b2c7cdea36d01a
2020-05-27 21:03:53 +00:00
Julia Reynolds
1e8ce29af7 Merge "Clarify conversation policy" into rvc-dev 2020-05-27 20:43:59 +00:00
Collin Fijalkovich
fd92d2fac3 Merge "Add performance counters to cacheinfo dumps." into rvc-dev am: 4edffac782 am: 23e5f201c8 am: 959b44ba0b am: cf0702af73
Change-Id: I8459abf3d6f654023d4cce5b881b382893c7302f
2020-05-27 19:11:20 +00:00
Collin Fijalkovich
cf0702af73 Merge "Add performance counters to cacheinfo dumps." into rvc-dev am: 4edffac782 am: 23e5f201c8 am: 959b44ba0b
Change-Id: Ie19567b510ec47ecc4fdec0ec4412beadbbc2502
2020-05-27 18:49:25 +00:00
Collin Fijalkovich
ca965f44fe Merge "Add performance counters to cacheinfo dumps." into rvc-dev am: 4edffac782
Change-Id: I73af6f35ecb97f7dd938e8de93f1d1f6a5c12808
2020-05-27 18:25:02 +00:00
Collin Fijalkovich
4edffac782 Merge "Add performance counters to cacheinfo dumps." into rvc-dev 2020-05-27 18:24:04 +00:00
Julia Reynolds
2fcfe23f79 Clarify conversation policy
Test: make
Fixes: 157482114
Change-Id: Icb6993a4c2c651465cadfa31c1d1915b7352994c
2020-05-27 12:47:10 -04:00
Louis Chang
f3639b8692 Merge "Do not always report configuration change to activity" into rvc-dev am: e500c6773b am: b29e0c2dc7 am: 731bdebe1c am: 84fd155147
Change-Id: I3170b111104ad5afeb868371bc390799d2bf185a
2020-05-27 05:13:43 +00:00
Louis Chang
84fd155147 Merge "Do not always report configuration change to activity" into rvc-dev am: e500c6773b am: b29e0c2dc7 am: 731bdebe1c
Change-Id: Ib1789b838fa2e36a638a82e297d839a156d1e7d3
2020-05-27 04:49:41 +00:00
Louis Chang
37fe59a2fe Merge "Do not always report configuration change to activity" into rvc-dev am: e500c6773b
Change-Id: I51d3dbb3f0805e7e0afa2edac88ae10fda9f6ea9
2020-05-27 04:18:07 +00:00
Louis Chang
e500c6773b Merge "Do not always report configuration change to activity" into rvc-dev 2020-05-27 04:17:14 +00:00
Collin Fijalkovich
88aa314afa Add performance counters to cacheinfo dumps.
Tracks the number of hits, misses, refreshes, and invalidations on a
per-cache basis, and makes that information available through dumpsys
cacheinfo.

Bug: 157175501
Test: adb shell dumpsys cacheinfo
Change-Id: Icabdd82acda2edc54d787d0a2d15a33ba18fd668
2020-05-26 18:47:42 -07:00
Artur Satayev
ec8727b453 Restrict some OpEntry#* methods for apps targeting R.
Partial revert of Ie4a2cb155c40d46c52d44e0f53c05d52a8a9b523.

Bug: 156307884,156254238
Test: m
Change-Id: I6fd0d4a010987170c2da258d331ac3143686ffe7
2020-05-26 16:09:25 +01:00
Neil Fuller
29867f046d Merge "Be more defensive around invalid tzids" am: f60c302dad am: 96c57398b4
Change-Id: If8695ee257155eaedc901aa797f1939eab0c721e
2020-05-26 10:54:50 +00:00
Neil Fuller
96c57398b4 Merge "Be more defensive around invalid tzids" am: f60c302dad
Change-Id: I08e1daaf9dd0a26017b18c984eb6d4093c46ed46
2020-05-26 10:36:28 +00:00
Neil Fuller
f60c302dad Merge "Be more defensive around invalid tzids" 2020-05-26 10:20:09 +00:00
Neil Fuller
26fe60a188 Be more defensive around invalid tzids
Add checks during boot in case the persist.sys.timezone property is set
to a bad ID.

This can happen in the rare case of a mainline rollback: i.e. if a device has
been set to a new ID and then the update is rolled back. Using GMT as a
fallback probably works without this change (it does in java.util.TimeZone),
but relies on all code, including native code that uses
persist.sys.timezone directly, knowing to interpret a bad ID as "GMT".
This commit makes that choice more explicit and defensive.

This change also removes the possibility of IOException, which is never
thrown, from some ZoneInfoDb methods.

Bug: 155738410
Test: boot with a valid id, verify persist.sys.timezone is unchanged
Test: boot with an invalid id set,  verify persist.sys.timezone is "GMT"
Merged-In: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Change-Id: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Exempt-From-Owner-Approval: Approved / landed internally
2020-05-26 10:19:53 +00:00
Stanislav Zholnin
9e3a623fac resolve merge conflicts of 25a656d916 to master
Change-Id: Ie6353043b4abcaccea368a0ee961f65f12ec397c
2020-05-25 20:46:02 +00:00
Stanislav Zholnin
e4f7ef8190 Merge "Remove UidAtomTests from presubmit due to failures." into rvc-dev am: c1846a1a65 am: 5a3280af45
Change-Id: I49aa667a556ea110ccda7a662fe5a7f401d9a964
2020-05-25 20:11:29 +00:00
Stanislav Zholnin
dc84372155 Merge "Remove UidAtomTests from presubmit due to failures." into rvc-dev am: c1846a1a65
Change-Id: Ic55f54c525d0aa21ed01ac9ea3fe9776ea47c663
2020-05-25 19:51:02 +00:00
Stanislav Zholnin
86b0b984cf Remove UidAtomTests from presubmit due to failures.
Test: manual

Bug: 155714228
Change-Id: I661c6503c387a00803bb949e3e8ca431045dd266
2020-05-25 19:01:34 +00:00
Stanislav Zholnin
b6804a1dbc resolve merge conflicts of 4603f2ac78 to master
Change-Id: I215aa52b3f5d1762742e65426e08b3bb71464397
2020-05-25 00:56:38 +00:00
easoncylee
a8714179a7 Fix mis-configuration of TEST_MAPPING file. am: 3e213cffec am: 77911d258b
Change-Id: Iebaef4b1c76b3ebe2eecf715a37c0354031c9a86
2020-05-24 23:55:38 +00:00
easoncylee
6043c366b5 Fix mis-configuration of TEST_MAPPING file. am: 3e213cffec
Change-Id: I59f141c2b95e29a69a4b0f19436349340e8417b2
2020-05-24 23:35:01 +00:00
easoncylee
3e213cffec Fix mis-configuration of TEST_MAPPING file.
UidAtomTests:testAppOps is a test class and test method of
CtsStatsdHostTestCases. To run this in Test Mapping, it should
specify CtsStatsdHostTestCases. as the name in TEST_MAPPING file,
and android.cts.statsd.atom.UidAtomTests as the options.

Bug: 155714228
Test: presubmit test.
Change-Id: I7df08ae811425020ebbeae6a8e9f1317065c00c9
2020-05-24 21:32:51 +00:00
Julia Reynolds
6304878212 Merge "Update conversation labels" into rvc-dev am: 28c3a34faa am: c9bf62b6fe am: c31eb3260f am: 8f0cbb4498
Change-Id: I4dfacbc5543b0cf096a49eee7f8a1c069ec4daf3
2020-05-21 20:11:16 +00:00
Julia Reynolds
c31eb3260f Merge "Update conversation labels" into rvc-dev am: 28c3a34faa am: c9bf62b6fe
Change-Id: I00b7afe871c74441cc823f4d2d7654fbc949dbb0
2020-05-21 19:34:33 +00:00
Julia Reynolds
a4eebac4e4 Merge "Update conversation labels" into rvc-dev am: 28c3a34faa
Change-Id: I9b1715deb958d5bf72ee173e46575f4a2788af1a
2020-05-21 19:17:25 +00:00