Commit Graph

467342 Commits

Author SHA1 Message Date
TreeHugger Robot
2d4e0f25f2 Merge "Add the locale field and an extra Bundle to the InlineSuggestionsRequest." 2020-02-18 04:00:52 +00:00
TreeHugger Robot
dc50039ae6 Merge "Remove code duplications" 2020-02-18 03:35:26 +00:00
Hyundo Moon
b5e0afed86 Merge "MediaRouter2: Enhance readability of MediaRouter2ServiceImpl" 2020-02-18 02:32:32 +00:00
Kyunglyul Hyun
96e4893dbe Merge "MediaRouter2: Clean up APIs" 2020-02-18 02:18:14 +00:00
TreeHugger Robot
e65d5c94bd Merge "Add enum for conversation screen" 2020-02-18 02:16:22 +00:00
Hyundo Moon
ea99a6640d Merge "MediaRouter2: Refactor internal classes" 2020-02-18 02:02:09 +00:00
JW Wang
5a91658ad8 Merge "Speed up tests" 2020-02-18 01:48:45 +00:00
Julia Reynolds
b4b35202f4 Add enum for conversation screen
Test: make
Bug: 149583455
Change-Id: I14ae457bc4d301db48b48c86ac62f64ecd0c752f
2020-02-17 19:34:01 -05:00
Mike Ma
afee1bbc35 Merge "Core proto definition for "dumpsys nfc --proto"" 2020-02-17 23:38:10 +00:00
Mike Ma
5313cbcb1b Core proto definition for "dumpsys nfc --proto"
Add NfcServiceProto for protobuf dumpsys of nfc service. Primarily used
by incident service to capture an incident report proto.

Command to invoke (any of the following after lunch and env setup):
$ adb shell dumpsys nfc --proto
$ adb shell incident 3052
$ incident_report 3052

Bug: 146086108
Exempt-From-Owner-Approval: Owners not reachable.
Test: Execute the above commands and compare the output against dumpsys
      nfc.

Change-Id: I024e148d64ccef5441a67efcbad95c622e5df12a
2020-02-17 15:34:36 -08:00
Jorim Jaggi
8ac64bc013 Merge "Revert "SystemUI Split via TaskOrganizer"" 2020-02-17 21:11:06 +00:00
TreeHugger Robot
2bbd85ce68 Merge "Clear calling id before binder call" 2020-02-17 20:54:31 +00:00
TreeHugger Robot
00ddcc82fe Merge "Import translations. DO NOT MERGE" 2020-02-17 19:47:32 +00:00
TreeHugger Robot
ae0405b504 Merge "Import translations. DO NOT MERGE" 2020-02-17 19:43:29 +00:00
TreeHugger Robot
2a5459ca7d Merge "Import translations. DO NOT MERGE" 2020-02-17 19:41:33 +00:00
TreeHugger Robot
5a2ac9ef58 Merge "Import translations. DO NOT MERGE" 2020-02-17 19:35:49 +00:00
Nick Chalko
90a13aa688 Merge "Add encoding information to TvTrackInfo" 2020-02-17 19:29:32 +00:00
atrost
24274277e1 Clear calling id before binder call
The permission check in app compat fails without clearing calling id.

Bug: 149662772
Test: launch com.appstem.mammoth, it crashed -> add clearcallingid -> doesn't crash
Change-Id: Ide87da8b8c13e8a10723f379bd4e4b386e5d35e4
2020-02-17 19:26:41 +00:00
Feng Cao
5f7e99e5d8 Add the locale field and an extra Bundle to the InlineSuggestionsRequest.
* The extra can be used to indicate the UI rendering library version, as well as anything else we may need after API freeze
* Also make the style in InlinePresentaionSpec publically accessible

Test: build
Bug: 146454892

Change-Id: Iaaf66c2dcffdef3ef8e91c347774afa3aa6176f9
2020-02-17 11:17:22 -08:00
TreeHugger Robot
37266b681a Merge "Modified getActiveAdminsForAffectedUser" 2020-02-17 19:07:25 +00:00
Alex Johnston
a875e43280 Modified getActiveAdminsForAffectedUser
* Removed parent parameter from method.
* If user is a managed profile, return active admins for that user.
* If user is not a managed profile, then add all the active admins
  for that user and the parent active admins of managed profiles
  associated with it.

Bug: 149461308
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAdminConfiguredNetworks
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetCameraDisabledLogged
      atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testAdminConfiguredNetworks
      atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testCameraDisabledOnParentLogged

Change-Id: I3a4f9dd9f43c1acd7115aede6d26bb288b110c80
2020-02-17 17:29:31 +00:00
Abhijeet Kaur
642b3d453e Merge "Null Pointer check on ApplicationInfo object before invoking method" 2020-02-17 17:10:50 +00:00
Anna Malova
6adc582d5d Merge "Flip flag to use WebView's implementation of libpac." 2020-02-17 17:09:26 +00:00
Linus Tufvesson
ab72687615 Merge "Block TYPE_PRESENTATION windows on default display" 2020-02-17 17:03:26 +00:00
TreeHugger Robot
309dca6ae2 Merge "Rename PasspointConfiguration#getSubscriptionExpirationTimeInMillis" 2020-02-17 16:23:47 +00:00
Jorim Jaggi
2a3002a54f Revert "SystemUI Split via TaskOrganizer"
Revert "Update CTS tests for tile-based split-screen"

Revert submission 9964969-sysui_split_screen

Reason for revert:
- Random SysUI crash (ag/10335781)
- Breaks IME tests with new_insets set to 2
- Crashes SysUI in split screen with new_insets set to 2.

Reverted Changes:
I103f68030: SystemUI Split via TaskOrganizer
If6740b7ee: Connect split-screen things to systemui divider
I44f497e7d: Update CTS tests for tile-based split-screen

Change-Id: Ife6878044ff19905ed97b599d8c67f80cb8e399e
2020-02-17 17:10:11 +01:00
Treehugger Robot
2481844969 Merge "[vts-core] add vts_permission_validate_test to vts-core" am: 1c91a3d51b am: d7097988d3 am: fb6597f154
Change-Id: Ie8a20dd5c80c4645b931d3520ddfba5a290e6e2e
2020-02-17 16:02:01 +00:00
SongFerng Wang
d16c2323c0 [automerger skipped] Merge "Config of LTE signal strength default value remove SNR" am: b9e141bc55 am: c443e7ba90 am: e417bcfd31 -s ours
am skip reason: skipped by user songferngwang

Change-Id: Ic2a76fcb0f1ff97e72046956425b472d6a862b91
2020-02-17 16:01:36 +00:00
TreeHugger Robot
8cde2c812e Merge "WindowInsetsAnimation: Clean up API" 2020-02-17 15:38:31 +00:00
TreeHugger Robot
201ae0ba59 Merge "Add media output group panel constant" 2020-02-17 14:31:38 +00:00
Sungsoo Lim
ea1eaf74f3 Remove code duplications
Also prevent callback be called before SysMRP created

Test: pass MediaRouter cts
Change-Id: I0cde791fc73a33de5d42dcb6e550016644301ffd
2020-02-17 23:21:26 +09:00
Lorenzo Colitti
9ce6aea73d Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: f202725395 am: 2c7a224e1b am: b7c9d205bf
Change-Id: Ie27e5dfd51b38194fa104cbd73f9bbe7c4395e0f
2020-02-17 14:20:04 +00:00
Nicolas Geoffray
6f589478d9 Merge "Revert "[DexLoadReporter] Report classloader contexts directly f..."" am: ae50e15d59 am: ea12868665 am: f96a5bf6a0
Change-Id: I0b69537e9c729cf5983bffcc6d37dfb35e000172
2020-02-17 14:19:52 +00:00
Treehugger Robot
3a6a81b684 Merge "Catch correct exception for adding route fail" am: c2050ac731 am: 55c0f41695 am: b6589dc1f6
Change-Id: Ie79acf53b0cdb532f81d4e61e669bdb101b71c0a
2020-02-17 14:19:32 +00:00
Chiachang Wang
0511cbcdd5 Merge "Update state in NetworkInfo when network resumes" am: a853d2dc37 am: 29a6b4f42f am: 3b9e7d958c
Change-Id: I98e64e6197c5e79e6425f39053981f7bf389a895
2020-02-17 14:18:56 +00:00
Abhijeet Kaur
0a04f04ea0 Merge "Whitelist PlatformCompat permissions for MediaProvider" 2020-02-17 14:18:48 +00:00
Junyu Lai
4689794e19 Merge "[SP16] Address comments on aosp/1172143" am: fc9e4fbc08 am: dfb6a0fdb9 am: a08cdb380e
Change-Id: I4cff4d096f375210585ceae5eb27002b97a35226
2020-02-17 14:18:32 +00:00
Junyu Lai
80a8bd4ce8 Merge "[SP17] Wait for stats providers to report stats update" am: 1e47a3e71d am: 9262c04be3 am: be15d2d70f
Change-Id: I719a1b2c75123f6fa6c765eeced055720c052c9b
2020-02-17 14:18:06 +00:00
Calin Juravle
9fd9baab38 Merge "Pass system server class loader context when asking GetDexOptNeeded" am: d42527b844 am: 7d3380d672 am: 2d5242b680
Change-Id: Ib59bf9c16f7f13a1cbf7cce48e9b56f77364f073
2020-02-17 14:17:41 +00:00
TreeHugger Robot
5905f9ffaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e3640bbf00 -s ours am: 3c9003980a -s ours
am skip reason: subject contains skip directive

Change-Id: I94155d05035d31570cbfb0802b09a8f01b3d317c
2020-02-17 14:17:32 +00:00
TreeHugger Robot
b38e4a7df2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 16716475fd -s ours am: 41fdc00e55 -s ours
am skip reason: subject contains skip directive

Change-Id: Id07dc49ffb15810fa5449901822d0d3510408589
2020-02-17 14:17:21 +00:00
TreeHugger Robot
f4e4f82ab5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 79ffd09927 -s ours am: edd78e89da -s ours
am skip reason: subject contains skip directive

Change-Id: If2d25c81bd0309f328642db7187de10dc72c80e7
2020-02-17 14:17:10 +00:00
TreeHugger Robot
0e112ad8cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 792f09927a -s ours am: 6f3e0a7e77 -s ours
am skip reason: subject contains skip directive

Change-Id: I7483f67191fc42d5c55d4d3bc3455c532878b033
2020-02-17 14:17:00 +00:00
Calin Juravle
8e9f0b4d55 Merge "[DexLoadReporter] Report classloader contexts directly from classloader" am: 5a01991fef am: ce9b12f5bf am: cb3d0f7ab5
Change-Id: I181e9df3dbf4e0c8551abcb4b7b912f4a05c11c0
2020-02-17 14:16:38 +00:00
Ivan Lozano
523aca0fad [automerger skipped] Merge "Remove execute-only memory related code." am: 615ef33216 am: cd3df3eeeb am: 18d80b13f7 -s ours
am skip reason: skipped by user ngeoffray

Change-Id: I6e5cc30e2a5c28dc814b1aa5293abc7559a969c4
2020-02-17 14:16:28 +00:00
JW Wang
99c5b20bbd Speed up tests
Don't reboot the device when there is no file to delete. This saves us a
significant amount of time since each reboot takes 1 min and there are
dozens of reboot during the whole test case.

Bug: 149528114
Test: atest StagedRollbackTest

Change-Id: If3b06a304d9c87680c7cc5b7498d3b2ecf11cdfa
2020-02-17 22:08:39 +08:00
Joanne Chung
559c57f493 Merge "Keep a strong reference to the InlineContentCallbackImpl" 2020-02-17 13:50:22 +00:00
Pavel Grafov
50495dd81c Merge "Allow control over account management of parent profile" 2020-02-17 13:48:20 +00:00
Linus Tufvesson
b386456680 Block TYPE_PRESENTATION windows on default display
... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

Bug: 141745510
Test: atest CtsWindowManagerDeviceTestCases:PresentationTest
Change-Id: I2aaab1903dee54190338f7b6e49888aa51437108
2020-02-17 13:37:25 +00:00
Adrian Roos
db5b0c2321 WindowInsetsAnimation: Clean up API
Fixes issues the app developers have raised with
the WindowInsetsAnimation API:

- it really makes more sense to have the Animation
  as the outer class, and the Callback nested within
- it was not obvious previously that multiple animations
  could be running at the same time. A new argument to
  onProgress now makes this abundantly clear by passing
  in the list of running animations.
- The dispatch mode really fits better as a final
  property on the callback, rather than it being
  queried once from a getter.

Also fixes lint warnings.

Fixes: 143556682
Test: make checkapi; atest WindowInsetsControllerTests
Change-Id: I8cd8faac70dd5a15d779d2c983f0a0ea5d6bbd8e
2020-02-17 14:30:25 +01:00