Commit Graph

18181 Commits

Author SHA1 Message Date
Alex Johnston
362ada443c Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I6bc664c4a640c76bb0b83478e4cfcaa2d1ee64c9
2020-06-19 12:34:10 +00:00
Alex Johnston
2a02c8e381 Merge "Change behaviour of screen capture disabled" into rvc-dev 2020-06-19 12:20:38 +00:00
Alex Johnston
302c1fe947 Change behaviour of screen capture disabled
Background
* Historically, when the screen capture disabled
  policy was set on the personal profile, screen
  capture was disabled for the whole device
  (per-device).
* This should be changed to only be disabled in
  the personal profile (per-profile).

Changes
* Renamed DevicePolicyCache methods to setScreenCaptureAllowed
  and isScreenCaptureAllowed
* Added parameter ownerCanAddInternalSystemWindow to
  isScreenCaptureAllowed

Bug: 148453838
Bug: 157035400
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: If1bd68f0ec3e88497c5d3b4382977b526b2364ba
2020-06-18 22:58:28 +01:00
Evan Rosky
affc0e64ce Merge "Use actual resizability for split-screen operations" into rvc-dev am: 058a713a74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854827

Change-Id: Id8b069365f30540fd3dda9824187976fb4174a59
2020-06-18 17:40:30 +00:00
Evan Rosky
058a713a74 Merge "Use actual resizability for split-screen operations" into rvc-dev 2020-06-18 17:25:53 +00:00
Nikita Ioffe
2ea633314f Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: I0c5fc35f9251c3ffd43b43d63b7bfbbddf8d5061
2020-06-16 20:31:04 +00:00
Nikita Ioffe
663727472a Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev 2020-06-16 20:17:29 +00:00
Shawn Lin
095fe5e396 Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I9ab450adab3542aa3d8b05ddccfd015dcc657a1c
2020-06-16 09:32:54 +00:00
Shawn Lin
1c2e8eafff Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev 2020-06-16 09:32:15 +00:00
Evan Rosky
889f49683f Use actual resizability for split-screen operations
Split-screen and activity-start were relying on resizeMode,
but that is what the activity requests vs how the system
actually treats a given task/activity. This caused some
inconsistencies in how non-resizable things were handled
when the developer option to force resizability was turned
on.

Also needed to fix an issue where non-leaf tasks would
get stuck with an out-dated intent. In particular, this
happened with the root HOME task which meant its
resizeMode could never change from that of FallbackHome.

Bug: 158514252
Test: enable force resizable in dev options and then launch
      camera into secondary split.
Change-Id: If06d047813315f39894bead19d2cbe0c9444f254
2020-06-15 19:57:55 -07:00
TreeHugger Robot
3679ed262e Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: I958250d37114932d7db384bf77fc3a4e742a2e1d
2020-06-15 20:16:22 +00:00
TreeHugger Robot
9ac716fc8b Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev 2020-06-15 20:06:31 +00:00
Stanislav Zholnin
9edce64ef2 Properly handle situation when currentOpPackageName returns null.
Fixes: 158309330
Test: adb shell content query --uri content://com.android.contacts/data --projection  contact_id:raw_contact_id:_id:display_name:last_time_used:data1:account_type:mimetype
Change-Id: I6c5d0c4fef150ba45721d474ac0f83778d543467
2020-06-15 17:28:33 +01:00
shawnlin
2806269a5a Fixed the conflict of the release methods of ActivityView & TaskEmbedder
There is a case in Bubble that we might release a un-initialized
TaskEmbedder while calling ActivityView.release() (ex. create a bubble
and don't expand it and then dismiss it) which will cause an exception.

Allow ActivityView.release() to be called at anytime and check the
initialization state before calling TaskEmbedder.release().

Bug: 155417004
Test: 1. Add bubbles and don't expands them then dimiss them
      2. Check logs.
Change-Id: I583ddd36f407c908cb63c109834940fc91c8d130
2020-06-15 15:47:14 +08:00
Jordan Jozwiak
a50847e505 DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724
2020-06-12 16:32:43 +00:00
Jordan Jozwiak
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +00:00
TreeHugger Robot
b6f3f8c8f5 Merge "Update javadoc for END_OF_DAY event." into rvc-dev am: a4c3cd425b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815144

Change-Id: Ia99822e02b14423b96985acf59f429e6c21e29b0
2020-06-11 22:26:08 +00:00
TreeHugger Robot
a4c3cd425b Merge "Update javadoc for END_OF_DAY event." into rvc-dev 2020-06-11 22:11:50 +00:00
Nikita Ioffe
ac095e5a1d Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage
This provides a signal for MediaProvider to whitelist access for full
external storage access.

Here is an overview of how the flow looks like:

1. When app is started within instrumentation with --no-isolated-storage
flag, ActivityManagerService will grant OP_NO_ISOLATED_STORAGE to that
package.
2. MediaProvider will note the OP_NO_ISOLATED_STORAGE app op as fallback
in case app doesn't have MANAGE_EXTERNAL_STORAGE permissions.
3. When instrumentation finishes, ActivityManagerService will change
mode of OP_NO_ISOLATED_STORAGE app op to MODE_ERRORED.

Test: atest ExternalStorageHostTest
Bug: 149894531
Change-Id: I51cd87e5e887b887fd8ac7a1a7ffff208266ffa8
2020-06-11 19:51:54 +01:00
TreeHugger Robot
bf52673a6a Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Icc00a6f35213958cb5badfb4e7311e646608b1bf
2020-06-11 18:41:57 +00:00
TreeHugger Robot
0561690cac Merge "Apply theme shape clipping to group convo avatars" into rvc-dev 2020-06-11 18:22:46 +00:00
Alex Johnston
c1a731879b Merge "Update setCameraDisabled javadoc" into rvc-dev am: bde41fcacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818602

Change-Id: Ic6ee5e324cce51734d1f1f02739bf5c967c673d8
2020-06-11 11:48:03 +00:00
Alex Johnston
bde41fcacf Merge "Update setCameraDisabled javadoc" into rvc-dev 2020-06-11 11:33:19 +00:00
Steve Elliott
86bc69a491 Apply theme shape clipping to group convo avatars
Fixes: 158493588
Test: manual
Change-Id: I57b5e0712822b345c9dcce74b8a6d6ff33409de6
2020-06-10 15:23:33 -04:00
Alex Johnston
0589baeae9 Update setCameraDisabled javadoc
* DA targeting pre-Q will have this request
  silently ignored

Bug: 157212233
Test: build

Change-Id: I5b993443cdbcb2afed9f65c9d01063e7e1777842
2020-06-10 14:48:54 +01:00
Hui Yu
d507b3256e Update javadoc for END_OF_DAY event.
END_OF_DAY event has non-null packageName and null className.

Fix: 154842373
Test: NA
Change-Id: I3f225d459445db8416c822768f147f5b359c4ea4
2020-06-09 16:19:21 -07:00
TreeHugger Robot
13d04ca7c7 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: Ibc7392839109a91bf5abaa3597badf158168d7aa
2020-06-09 22:45:41 +00:00
TreeHugger Robot
6a28d69c24 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev 2020-06-09 22:41:40 +00:00
Varun Shah
4bffd45f2f Reduce "Failed to find provider info" logspam.
If the user is not unlocked, log at the warning level instead of error
to reduce logspam from non-direct boot aware providers.

Fixes: 148747075
Test: manual (observe logs before and after user unlock)
Change-Id: Icd0fb23982a78fb413f329da93b2ce01d37aca2a
2020-06-09 13:39:53 -07:00
TreeHugger Robot
c315e25ec7 Merge "Remove debug code before beta release." into rvc-dev am: c81dddfda6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810423

Change-Id: Id3912360601216fa259376320abcfc772981c6f0
2020-06-09 20:21:11 +00:00
Hui Yu
cdfb1d6c30 Remove debug code before beta release.
Remove the debug code for feature:
1. Background started FGS while-in-use permission restriction
2. Foreground service type camera and microphone.

Bug: 158579189
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerApi29Test.java
atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
atest cts/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java

Change-Id: I9669db918af3740509a090c3075d93588110cea1
2020-06-09 10:36:57 -07:00
Hui Yu
eb487f610a Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: Ie1ac5bbc2ee1e2af4708c8e584568f8f3d6cecb3
2020-06-09 05:14:29 +00:00
Hui Yu
c05fd22ce1 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev 2020-06-09 05:01:28 +00:00
Joanne Chung
158b81b6f0 Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I3be81b8ba85c2ed8809f2c798a543bd4ff5469fe
2020-06-09 00:35:13 +00:00
Hui Yu
08ab384989 Add uid to PendingStartActivityUids when activity resumed.
Previously we add uid to PendingStartActivityUids at activity start.
Now we also add uid to PendingStartActivityUids at activity resumed
because we can not wait for updateOomAdj() to be run by a runnable that
WindowManager send to DisplayThread at activity resumed.

At ActivityManagerService.getProcessStatesAndOomScoresForPIDs(), if the
ProcessRecord is in PendingStartActivityUids, we hard code the
ProcessRecord to be PROCESS_STATE_TOP and FOREGROUND_APP_ADJ, ahead of
result of updateOomAdj() the comes later.

Bug: 155143386, 157180494
Test: Reproduce steps of 155143386, swipe between GCA and
Snapchat, camera access is allowed after swipe.

Change-Id: Ia11b0e3400e4df851b250beb01dcfda43580668b
2020-06-08 15:35:26 -07:00
Nate Myren
61ab30d2a6 Revert "Use permissionController name rather than hardcode"
Revert submission 11618534-rename-resources

Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround

Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129
2020-06-08 19:35:05 +00:00
Joanne Chung
c6adc68368 Handle SyncResultReceiver.TimeoutException
1.Change SyncResultReceiver.TimeoutException to checked exception
2.Handle the SyncResultReceiver.TimeoutException in AutofillManager,
ContentCaptureManager, ContentSuggestionsManager
3.Fix the bug we should throw e.rethrowFromSystemServer()

Bug: 156044027
Test: atest CtsAutoFillServiceTestCases
Test: atest ContentSuggestionsManagerTest
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I959d2aca2b80866c076fae2520de66c123f5367d
2020-06-08 14:53:45 +08:00
Shawn Lin
855ecdd0e8 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: I103f7db216c495c2bfeaa83506eca23923b92e1f
2020-06-08 03:45:53 +00:00
Shawn Lin
c54d84a858 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev 2020-06-08 03:34:20 +00:00
Philip P. Moltmann
802f5b5005 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: Ieb4c0a463493723fab5f344ae6d80cfaad138e08
2020-06-06 18:19:01 +00:00
Philip P. Moltmann
8083336a88 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev 2020-06-06 18:10:11 +00:00
Steve Elliott
eec7f12366 Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf
2020-06-06 15:29:19 +00:00
Steve Elliott
05e10b59af Merge "Fix missing icon for one-to-one convos" into rvc-dev 2020-06-06 15:12:04 +00:00
Svetoslav Ganov
2d56a15699 Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c
2020-06-06 15:06:03 +00:00
Svetoslav Ganov
0ce4fba38f Merge "Correctly offset app op history on reboot" into rvc-dev 2020-06-06 14:50:03 +00:00
Stanislav Zholnin
5a337a6a9f Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689275

Change-Id: I1805e5b42ddbc311677a7e80de9f5c3bcb8ffccd
2020-06-06 14:30:43 +00:00
Stanislav Zholnin
c784a29dfd Merge "Keep unforwarded operation for noted ops." into rvc-dev 2020-06-06 14:12:38 +00:00
Stanislav Zholnin
e44f134adb Keep unforwarded operation for noted ops.
Align treatment of noted ops with AsyncNotedOps.

Fixes: 154775996
Test: atest AppOpsLoggingTest#disableCollectedAndNoteSyncOpAndCheckLog
Change-Id: I3dcd8275b6229946875bc184d25b18d2da76d5ba
Merged-In: I3dcd8275b6229946875bc184d25b18d2da76d5ba
2020-06-06 06:45:16 +00:00
Vinit Nayak
e5596e83cb Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I4ba1088269fec55593541d4a448cb511be5d470a
2020-06-05 19:10:28 +00:00
Vinit Nayak
2983b70983 Merge "Pass displayId to onActivityRotation()" into rvc-dev 2020-06-05 18:58:32 +00:00