Commit Graph

67700 Commits

Author SHA1 Message Date
TreeHugger Robot
2b6615f1c5 Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75ef am: e5124bc990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707946

Change-Id: I225ae9498e26f785c4be9762f1de22102e5d7d3f
2020-06-03 08:08:30 +00:00
TreeHugger Robot
29b40f3ea1 Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47a5 am: 9662b11ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675077

Change-Id: Ic713a0cbc076b1131840a9f41dd12d7291464d2b
2020-06-03 08:08:13 +00:00
TreeHugger Robot
f37bed75ef Merge "Don't reset permission granted by role." into rvc-dev 2020-06-03 07:56:42 +00:00
TreeHugger Robot
d26ded47a5 Merge "Fix AppOps estimation call time out." into rvc-dev 2020-06-03 07:38:25 +00:00
Junyu Lai
cba8b949b3 Merge "Disable log for per uid blocked status changed event" into rvc-dev 2020-06-03 06:18:01 +00:00
TreeHugger Robot
9675755610 Merge "Adds null checks to ShortcutManager#getShareTargets()" into rvc-dev am: 843f071dba am: eb7ace0b77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11663399

Change-Id: I2c91d844fb89b21cc3c91b46f062fca273493fd9
2020-06-03 02:12:44 +00:00
Evan Rosky
f22129fab7 Merge "Remove unused restore-mode logic in ActivityStack" into rvc-dev am: 99ed6ce743 am: 81f2ea40e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694346

Change-Id: I6db9e30c3a3072528659cc822adcfed14a5cb5e6
2020-06-03 02:12:29 +00:00
TreeHugger Robot
843f071dba Merge "Adds null checks to ShortcutManager#getShareTargets()" into rvc-dev 2020-06-03 02:01:47 +00:00
TreeHugger Robot
eca29fbfb3 Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev am: 6e97539ea4 am: 3e5586b2c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593908

Change-Id: I6d40b97d888740585270ebf44524d3fc4099a779
2020-06-03 01:51:33 +00:00
Evan Rosky
99ed6ce743 Merge "Remove unused restore-mode logic in ActivityStack" into rvc-dev 2020-06-03 01:44:40 +00:00
TreeHugger Robot
6e97539ea4 Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev 2020-06-03 01:27:01 +00:00
Santiago Etchebehere
350630968e Merge "Always compute zoom in adjustWallpaperWindows" into rvc-dev am: f0c6851adc am: 22ce4db7c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11685389

Change-Id: Ibccd6b3a83da22eacc9ca1000e4a6fe51b79e7ca
2020-06-03 00:26:49 +00:00
TreeHugger Robot
8ba03d744f Merge "Clean up existing a11y listeners when reparenting." into rvc-dev am: 4d3059c0ba am: 2e7a1c9468
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707943

Change-Id: I0ff73b391b1f24959a6587634a94c58aded0b79f
2020-06-03 00:26:27 +00:00
Santiago Etchebehere
f0c6851adc Merge "Always compute zoom in adjustWallpaperWindows" into rvc-dev 2020-06-03 00:08:20 +00:00
TreeHugger Robot
4d3059c0ba Merge "Clean up existing a11y listeners when reparenting." into rvc-dev 2020-06-03 00:06:25 +00:00
Evan Rosky
e3aad911e0 Remove unused restore-mode logic in ActivityStack
This was added when split-screen was implemented in
a flat manner (and thus Wm had to remember what mode
the stack was in before going to split). Now that
split-screen is based on inheritence, this is basically
dead code.

Additionally, now that we use task-organizers for
split, this actually gets in the way because it can
end-up doing something the organizer didn't ask for.

Bug: 151881448
Test: Existing tests pass.
Change-Id: I9fecdc704499c09c2e2924081b2e323d9b85ae0a
2020-06-02 16:39:07 -07:00
Santiago Etchebehere
ac74a59940 Always compute zoom in adjustWallpaperWindows
Bug: 157946272
Test: manual
Change-Id: Ieccbf4947923fab24ed429c4505448f1e09aa971
2020-06-02 14:48:23 -07:00
Jeff Sharkey
683d30fbe0 Merge changes from topic "jun2" into rvc-dev am: 3dce721a90 am: e73e587665
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707940

Change-Id: I58140daa06a72adf08019264938848fb376c732f
2020-06-02 21:23:24 +00:00
Hai Zhang
253fa2b876 Don't reset permission granted by role.
Role isn't reset when clearing package data, so its permissions
shouldn't be reset as well. This becomes important as we are using
roles to replace DefaultPermissionGrantPolicy now, so GRANTED_BY_ROLE
should also behave like GRANTED_BY_DEFAULT. In case any future role
should be revoked upon clearing package data, the role itself should
handle permission revocation as well.

Fixes: 158026399
Test: Clear package data for Photos, observer that storage permissions
      are not revoked because they are granted by role, instead of
      being temporarily revoked and granted seconds after launching
      the app again
Change-Id: Iea1fd1a4e15c106c31c30d10ab6bf84d475455c2
2020-06-02 14:07:23 -07:00
Jeff Sharkey
3dce721a90 Merge changes from topic "jun2" into rvc-dev
* changes:
  Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #5.
  More AMS/UGMS lock detangling.
2020-06-02 21:01:07 +00:00
Garfield Tan
00959aee2c Clean up existing a11y listeners when reparenting.
This would clean up listeners if display has been reparented more than
once.

Bug: 157605189
Test: Bubbles show up.
Test: atest DisplayContentTests
Change-Id: Ic616015ff516e4c054fdaab5cc0d82e8d82c8dfc
2020-06-02 12:42:53 -07:00
TreeHugger Robot
b14871cda2 Merge "Add more options to cmd vibrator" into rvc-dev am: 70efc10d51 am: 25d0472765
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691825

Change-Id: I537806d9961338ddfa5974ea632c9f0fcebccaaf
2020-06-02 19:40:51 +00:00
TreeHugger Robot
70efc10d51 Merge "Add more options to cmd vibrator" into rvc-dev 2020-06-02 19:16:52 +00:00
Jeff Sharkey
836c7089f6 Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #5.
Now that the underlying deadlock should be resolved, we can attempt
to enable the dynamic permissions checking.

Bug: 115619667
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Change-Id: Id0ae1e489efd1df9d89ea7e0454da5fe7bb27ee0
2020-06-02 12:54:28 -06:00
Jeff Sharkey
a7f0b62142 More AMS/UGMS lock detangling.
We've seen additional evidence of deadlock between AM and UGMS, so
this change explicitly detangles those two locks to ensure that we
never hold the UGMS lock while calling into AMS, and it adds explicit
validation that will immediately throw instead of waiting a lurking
deadlock to trigger.

This change adds explicit "locked" and "unlocked" tags to relevant
methods inside UGMS to make it easier to track locking dependencies.

It also buttons up internals to be "private", ensuring that all
external callers are routed through our LocalService interface;
this has some additional overhead for inner-class method dispatch,
but the added safety outweighs the cost.

Bug: 115619667, 157863128
Test: atest WmTests:ActivityStarterTests
Test: atest FrameworksServicesTests:com.android.server.uri
Test: atest CtsAppSecurityHostTestCases:android.appsecurity.cts.AppSecurityTests#testPermissionDiffCert
Test: atest CtsWindowManagerDeviceTestCases:CrossAppDragAndDropTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Change-Id: Ib9d466d6c9844d03626d8f0b30ca69a76d00f02f
2020-06-02 12:51:20 -06:00
Joanne Chung
6c3b204c8b DO NOT MERGE: Remove storage grant to the content capture service. am: 97c5c02260 am: bb4b866846
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11305093

Change-Id: I211899bfc491a1ab4a8ea4512ad13fdddf03dd45
2020-06-02 18:45:45 +00:00
Joanne Chung
bb4b866846 DO NOT MERGE: Remove storage grant to the content capture service. am: 97c5c02260
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11305093

Change-Id: I5668f4e469f4b9b61173c084c34cd616f05fe55a
2020-06-02 18:39:49 +00:00
TreeHugger Robot
ad23c8db4e Merge "DO NOT MERGE: Remove storage grant to the content capture service." into rvc-dev 2020-06-02 18:35:30 +00:00
Lais Andrade
fa727c7fac Add more options to cmd vibrator
- Add option -s to prekabed, to enable fallback on unsupported effect;
- Add command capabilities to print HAL capabilities;
- Add attribute USAGE_TOUCH to apply
  Settings.System.HAPTIC_FEEDBACK_INTENSITY to scale effects;

Fix: 157984210
Test: manual
Change-Id: Ie2d63a46d16387abe853ae12c20fb6a808020662
Merged-In: Ie77c4309e7c464b32e8dd6150a7840f1dc385e14
2020-06-02 18:10:21 +00:00
Winson Chung
962e5b20de Merge "Add the leaf task to the recents animation target" into rvc-dev am: c37e9cfa4a am: 76ac21ea6e
Original change: undetermined

Change-Id: Ie4b4ef3ec17dbe69d7bcec2cd6b2d79f3da4c853
2020-06-02 17:27:11 +00:00
Winson Chung
c37e9cfa4a Merge "Add the leaf task to the recents animation target" into rvc-dev 2020-06-02 17:00:04 +00:00
Hayden Gomes
11d9ac0454 Merge changes from topic "adjustSuggestestedStreamVolumes" into rvc-dev am: a851d4ace9 am: cf0898ed93
Original change: undetermined

Change-Id: If757fe657cdb6f0c3798849f44fa03cd65e512a2
2020-06-02 16:46:04 +00:00
Hayden Gomes
a851d4ace9 Merge changes from topic "adjustSuggestestedStreamVolumes" into rvc-dev
* changes:
  Consolidating MODIFY_AUDIO_SETTINGS permission checks
  Making adjustSuggestestedStreamVolumes consistent
2020-06-02 16:19:46 +00:00
Gavin Corkery
aafb1f7006 Merge "Unbind explicit health check controller when possible" into rvc-dev am: d43ac6b413 am: ca7187adfe
Original change: undetermined

Change-Id: Iba7c4f436203554e1dcee32eb664aff827400910
2020-06-02 14:58:14 +00:00
Riddle Hsu
b300644acc Merge "Use normal rotation while PiP is toggling or active" into rvc-dev am: 3b648e41bc am: ebbfb1b147
Original change: undetermined

Change-Id: If54dd96da68caefe7391ca4da88c87bea76f4d1c
2020-06-02 14:57:59 +00:00
Gavin Corkery
d43ac6b413 Merge "Unbind explicit health check controller when possible" into rvc-dev 2020-06-02 14:46:59 +00:00
Riddle Hsu
3b648e41bc Merge "Use normal rotation while PiP is toggling or active" into rvc-dev 2020-06-02 14:34:50 +00:00
Jeff Sharkey
62ea6800be Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b858a am: dd86940501
Original change: undetermined

Change-Id: I8b30066f6c76f4b1718c64c86af73931a055007f
2020-06-02 13:36:39 +00:00
Jeff Sharkey
dfb06b858a Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev 2020-06-02 13:10:55 +00:00
Junyu Lai
bf55f0e028 Disable log for per uid blocked status changed event
This consumes ~3.5% system logs, however it is not very useful
when debugging since similar information could be obtained from
dumpsys {connectivity|netpolicy}. Thus, remove the log.

Test: manual
Bug: 135504481
Change-Id: I04d2b7402f892546722fe6868c521afd9534f183
Merged-In: I04d2b7402f892546722fe6868c521afd9534f183
(cherry picked from commit 21a352f761)
2020-06-02 10:19:41 +00:00
Junyu Lai
823935ab61 Merge "Disable log for per uid blocked status changed event" am: eee7b45375 am: 21a352f761
Original change: undetermined

Change-Id: I2783cc948365a37b7446064cfc00714ab6abba17
2020-06-02 10:06:42 +00:00
Junyu Lai
d6f5beb876 Merge "Address ag/11032295 leftover comments" into rvc-dev am: 1ca44e0dcf
Original change: undetermined

Change-Id: I4121f9c6ed3b51c5ddf8f4a294b23bbf2bfd86c1
2020-06-02 09:53:29 +00:00
Junyu Lai
78ba00046c Merge changes I3180050c,Ie393451e into rvc-dev am: 4f0fea0c82
Original change: undetermined

Change-Id: If2babad9c0d8af57303e4e8e905f4d5a658133d7
2020-06-02 09:53:10 +00:00
Junyu Lai
21a352f761 Merge "Disable log for per uid blocked status changed event" am: eee7b45375
Original change: undetermined

Change-Id: I6ba38a19e1ac1d7f3f3eccef76aa10f75273ca47
2020-06-02 09:52:38 +00:00
Riddle Hsu
80653eaa40 Use normal rotation while PiP is toggling or active
Seamless rotation of PiP has not been defined. To avoid ugly jump
cut when moving PiP with different orientation, the display is
still frozen to perform normal rotation animation.

Fixes: 156593887
Test: atest DisplayContentTests#testNoFixedRotationWithPip

Change-Id: I6830970ada96023fc5b93afb2f9a917988c93b59
2020-06-02 17:41:08 +08:00
Junyu Lai
1ca44e0dcf Merge "Address ag/11032295 leftover comments" into rvc-dev 2020-06-02 09:34:07 +00:00
Junyu Lai
4f0fea0c82 Merge changes I3180050c,Ie393451e into rvc-dev
* changes:
  Address ag/11592772 leftover comments
  Fix perfd receives delayed {wifi|mobile}_bytes_transfer atoms
2020-06-02 09:33:35 +00:00
Nandana Dutt
1b8e6766e2 Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."
This reverts commit 14c5c4d997.

Reason for revert: http://b/157970772
BUG: 157970772

Change-Id: I95a35d9b99a7cc6950c7f00e42d11fe07b472a44
2020-06-02 09:29:02 +00:00
Hyundo Moon
a93451b509 Merge "Add bug numbers for TODOs in MediaRouter2 related classes" into rvc-dev am: 5c8f3b20d5
Original change: undetermined

Change-Id: I441f51b100a3b7aa5d17e9199ae0e9c122695d64
2020-06-02 08:27:35 +00:00
Hyundo Moon
5c8f3b20d5 Merge "Add bug numbers for TODOs in MediaRouter2 related classes" into rvc-dev 2020-06-02 08:16:58 +00:00