Commit Graph

18721 Commits

Author SHA1 Message Date
Stanislav Zholnin
d3fbb9fe8b Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c am: 113387f309 am: 7f757a3006 am: 1ed2d1e39a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: Ib06abfe9399b0c69ab26c137b77f395033c55219
2020-06-22 09:14:07 +00:00
Stanislav Zholnin
7f757a3006 Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c am: 113387f309
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: Idd9acf7078c05270b99bf064702e92257ddc2496
2020-06-22 08:40:35 +00:00
Stanislav Zholnin
7a65a7a37c Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev 2020-06-22 08:10:52 +00:00
TreeHugger Robot
96140c8b07 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6 am: d676060146 am: 721e445b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9df265b1e5ab8734b3f2917e3bd933f11809e026
2020-06-22 03:55:20 +00:00
TreeHugger Robot
d676060146 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I22ad6b374f4f966e1fd2b02ac23caf7817bde105
2020-06-22 03:31:19 +00:00
TreeHugger Robot
48e9dc67f1 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev 2020-06-22 03:04:37 +00:00
Jeff Chang
79f5a49b3c Revert "Fix transition return issues when more than 1 level depth"
This reverts commit 6d834d86fb.

Reason for revert: <http://b/159230864 WhatsApp image is visible after existing a chat>
Bug: 159230864

Change-Id: Ib266cff2e06a82ae9a0e85142ef80ae00328a040
2020-06-20 06:09:04 +00:00
TreeHugger Robot
d4719d4aea Merge "Improve app-ops docs" 2020-06-20 04:26:19 +00:00
Philip P. Moltmann
b06f5eed35 Improve app-ops docs
- featureId was renamed attributionTag
- explain the difference between instantious and long running ops
- factor proxying into its own section

Test: docs only
Change-Id: Ib94b55f1fa7ba4da71dcf41e8af2d29b73e8bad0
2020-06-20 03:01:36 +00:00
Automerger Merge Worker
a3bc86ea47 Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709" into rvc-qpr-dev-plus-aosp am: 49cc74c60e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I77bc10cc1173b2a653d5c796ddd4d4ef76fc1455
2020-06-19 22:41:40 +00:00
TreeHugger Robot
c2623c38d3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: Iba3af539238fbc97e0c7a251723c4d50d31ee92a
2020-06-19 22:18:25 +00:00
TreeHugger Robot
319a6644f3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I4a5f511e3739df3ef55070887bbe8929767e58d7
2020-06-19 21:43:33 +00:00
TreeHugger Robot
7ec25249ab Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev 2020-06-19 21:29:40 +00:00
Stanislav Zholnin
456b496e4a Save AsyncOps for later forwarding instead of SyncOps.
Fixes: 159082266
Test: atest AppOpsLoggingTest
Change-Id: I3f8da9d7c2925233e5e53cfa7fd5e4cd1c258b29
2020-06-19 19:48:35 +01:00
Stanislav Zholnin
54762b293e Prevent developer provided strings from being uploaded through statsd.
- in situation when developer provides message when op is noted, do not
report it through stack trace collection infrastructure
 - collect only statcktraces for OP_FLAG_SELF and OP_FLAG_TRUSTED_PROXIED to
match collection of appops counts

Test: atest  android.app.appops.cts.RuntimeMessageCollectionTest
Fixes: 159433071
Change-Id: I1ab56a530832873a1f1f68aba5ab6eabc9e8a17a
2020-06-19 19:43:03 +01:00
Nikolas Havrikov
b1eae3a0bc Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 am: 11334e7104 am: 18f1c524b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: I4391e46830831858cd39489204f8c4d815b9aa86
2020-06-19 18:37:24 +00:00
Nikolas Havrikov
11334e7104 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Idc130a88857cb4332d2af1c401aeb0c63cb20f12
2020-06-19 18:14:39 +00:00
Nikolas Havrikov
a457821085 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Id964f7b5ffed9c9836f8fd8db2d958f8ea9be582
2020-06-19 18:01:06 +00:00
TreeHugger Robot
8d0d16fd2d Merge "Copying some ActivityManager hidden APIs to Internal" 2020-06-19 17:49:48 +00:00
Nikolas Havrikov
0cf1ad8495 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev 2020-06-19 17:49:34 +00:00
Nikolas Havrikov
7771e6ebf5 Ensure mShowDialogs gets updated as part of global config update
The "App keeps crashing" dialog appears on Android TV even
though it should not. This would usually be accounted for
by setting mShowDialogs to false in the ActivityTaskManagerService
on boot. However, this does not happen because the service uses a
method of the ActivityTaskManager which pulls its configuration
from the context, which at this point is not yet updated to reflect
relevant values like the uiMode.

This change solves this problem by introducing an internal method
in the ActivityTaskManager, which acts on a given configuration
instead of the one from the context. This is helpful because the
caller ActivityTaskManagerService is holding on to the correct
configuration in the first place.

Furthermore, this change does not impact any outward-facing
behavior, nor does it introduce code duplication as the old
method of ActivityTaskManager new merely delegates its task
to the new one with the same configuration it would have
originally pulled from the context.

Test: Manually on ADT-3 device
Bug: 159019027
Change-Id: I0fac574a69a19243c2e62b967978ef5d8318ee51
2020-06-19 15:23:50 +02:00
Alex Johnston
55d78b8675 Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381 am: 4e332683a7 am: da45fdc99f am: b00d036912
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I69ae26a0dabb271a9f59abe1c060be0f4285c06c
2020-06-19 13:19:45 +00:00
Alex Johnston
b00d036912 Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381 am: 4e332683a7 am: da45fdc99f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I6521bb68ebe4103c66488410bd4a09353f04d3b3
2020-06-19 13:07:02 +00:00
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
Suprabh Shukla
1f79c1af5b Copying some ActivityManager hidden APIs to Internal
Starting with updating references in alarm manager. Will update
references across the module in a follow up.
This is the first step to formalize them as in-process SystemApi.

Test: atest CtsAlarmManagerTestCases
atest FrameworksMockingServicesTests:com.android.server.alarm

Bug: 159382386
Change-Id: If066187bf26f1f6c532ab0f986996d427c1a17fa
2020-06-18 22:43:52 -07: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
Alex Mang
41f94e585f Merge changes from topic "feedback"
* changes:
  Flag guarding all notification feedback UI
  Adding automatic option in long press menu
  Adding notification guts to feedback icon
  Add notification feedback indicator icon.
2020-06-18 20:38:37 +00:00
Evan Rosky
a50972f365 Merge "Use actual resizability for split-screen operations" into rvc-dev am: 058a713a74 am: affc0e64ce am: 20f63988ea am: 607f64cc73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854827

Change-Id: Iedba7784b776cbc65b106fd50ed50c958cb7187d
2020-06-18 18:11:51 +00: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
ac0b70df10 Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a am: 2ea633314f am: f055be048b am: bd787d983d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: Ic2f0f48e951e6f89af64e772496f700f383ba397
2020-06-16 21:29:28 +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
TreeHugger Robot
d4ab7ece55 Merge "Do not change value read from manifest." 2020-06-16 16:49:18 +00:00
Shawn Lin
6a7cc1e1b8 Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e am: a221212709 am: afa2d8c4d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I30ae73cfa7129bb5fd1863c96d4788e349420e09
2020-06-16 10:03:11 +00:00
Shawn Lin
a221212709 Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I8fd640956369d9b07f6bd30ced6fd8e7bbf94a71
2020-06-16 09:38:29 +00:00
Joël Stemmer
c9b74efafb Merge "Update javadoc in IBackupAgent.aidl" 2020-06-16 09:37:27 +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
5cc71314bd Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b am: b9af8e1af3 am: d772d1fc40 am: bceb722bec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: I12e579d92fec3a0e2df07a7fd9e1122b9eca1c16
2020-06-15 21:13:20 +00:00
TreeHugger Robot
d772d1fc40 Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b am: b9af8e1af3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: Idd431d294b85784a34852f463394c9cb8e2a17a4
2020-06-15 20:46:11 +00: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
Alex Buynytskyy
3c7b637abf Do not change value read from manifest.
Current code modifies the flag 'profilable' based on another flag
'debuggable'.

Test: refactoring CL. Existing unit tests still pass.

Change-Id: Ib6564eb494a977b97fc2107f144bc87d4bd1e36a
2020-06-15 12:26:59 -07:00
Joël Stemmer
a1ff637467 Update javadoc in IBackupAgent.aidl
Remove the token param from the doBackup() javadoc since the token
parameter no longer exists, and change the quota params to match the
actual parameter name.

Bug: 136795960
Test: Did not run tests, this is just a Javadoc change
Change-Id: Ife2ab3a0cf11ebea9bf74581d706322c01ad6f1c
2020-06-15 17:05:23 +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
Neil Fuller
7c7709207f Make TimeZoneDetector own its config
Make TimeZoneDetector responsible for configuration of time
zone detection behavior on device and have it enforce user capabilities.

This provides a set of configuration/capability classes, listeners and
tests that should allow SettingsUI apps to switch over to using them
while maintaining existing behavior and restrictions.

Ultimately, this should get us to a point where all time zone detection
configuration is conducted via TimeZoneDetector.updateConfiguration()
rather than modifying / listening to android.provider.Settings directly.

The listener support is intended for any users that currently watch
settings directly.

The TimeZoneCapabilities and TimeZoneConfiguration are designed to be
extensible so that more configuration properties can be added as the
time zone detector becomes more sophisticated. updateConfiguration()
supports partial configs so that clients only need to be explicit about
the config properties they know about and want to change.

This change is also a step towards removing race conditions in time zone
detection that could occur if settings are changed mid-way through a
time zone detection cycle: synchronization in
TimeZoneDetectorStrategyImpl ensures that the configuration won't change
unexpectedly.

Test: atest services/tests/servicestests/src/com/android/server/timezonedetector
Test: atest core/tests/coretests/src/android/app/timezonedetector
Change-Id: I3283b7fb7aa978df44a27ab7cd8cacdbe042b17b
2020-06-15 11:18:46 +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