Commit Graph

18677 Commits

Author SHA1 Message Date
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
1c2e8eafff Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev 2020-06-16 09:32:15 +00: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
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
Jordan Jozwiak
412d74f4ea DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I2115977b5db532c6cce8b09c7eabcf566a72eba4
2020-06-12 16:39:42 +00:00
Jordan Jozwiak
1c71776f9b 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: If2799ec77afaf273db94e88bf101da0de28ec9a0
2020-06-12 16:32:46 +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
Jordan Jozwiak
b7a85b71af Merge "Update lockNow doc to reflect support in R" 2020-06-12 16:21:04 +00:00
TreeHugger Robot
c87f3662b7 Merge "Update javadoc for END_OF_DAY event." into rvc-dev am: a4c3cd425b am: cea02e77f0 am: 188b4b7fad am: f96a3a9a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815144

Change-Id: Ia63401d7076fb6062c46be648c80ddd8fb200171
2020-06-11 23:02:53 +00:00
TreeHugger Robot
188b4b7fad Merge "Update javadoc for END_OF_DAY event." into rvc-dev am: a4c3cd425b am: cea02e77f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815144

Change-Id: I9c999a8d31756a4d7021771960e1c6e2e02c1831
2020-06-11 22:37:34 +00:00
TreeHugger Robot
a4c3cd425b Merge "Update javadoc for END_OF_DAY event." into rvc-dev 2020-06-11 22:11:50 +00:00
TreeHugger Robot
a7565c1bd1 Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac am: e97c7fbfec am: bd1153d52d am: 56640d5623
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: I75d4cffbe410dc41309dbfbb8db772bbd3adacea
2020-06-11 19:22:00 +00:00
TreeHugger Robot
bd1153d52d Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac am: e97c7fbfec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Id487db769b688dbc29c4a6b2d8de4e7b0e3d9b1f
2020-06-11 18:59:56 +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
Automerger Merge Worker
4dda54f359 Merge "Merge "Update setCameraDisabled javadoc" into rvc-dev am: bde41fcacf am: 3bfec9f0a0 am: 2ae1cfc8ed" into rvc-qpr-dev-plus-aosp am: 99f5e0c3e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818602

Change-Id: Iac830335f71b11aecbc1a281e43bbe8b63d56623
2020-06-11 12:40:27 +00:00
Alex Johnston
2ae1cfc8ed Merge "Update setCameraDisabled javadoc" into rvc-dev am: bde41fcacf am: 3bfec9f0a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818602

Change-Id: I2c7e98bf0a148a498c8120eff2bb96c0fe55fbc9
2020-06-11 12:00:52 +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
Kweku Adams
7cca3d35c4 Merge "Remove deprecated method." 2020-06-10 15:26:28 +00: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
Automerger Merge Worker
0a08a110f6 Merge "Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24 am: 19459ea5a7 am: 4a2e25e155" into rvc-qpr-dev-plus-aosp am: 7bcc302d2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: I87171c252528746891bf5d13562ac1f51f51cb3d
2020-06-09 23:22:57 +00: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
4a2e25e155 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24 am: 19459ea5a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: I0cec965e7dbcf0403daaa0b9189b2794776fe787
2020-06-09 22:52:36 +00:00
TreeHugger Robot
6a28d69c24 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev 2020-06-09 22:41:40 +00:00
Automerger Merge Worker
8a75fa8bac Merge "Merge "Remove debug code before beta release." into rvc-dev am: c81dddfda6 am: c315e25ec7 am: 5b1ac9a432" into rvc-qpr-dev-plus-aosp am: 71a03b357b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810423

Change-Id: I07759ef87a7503f6a79f3167ebe53f99d1ba50c7
2020-06-09 21:03:33 +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
TreeHugger Robot
29be1558ae Merge "Remove unused DPM.getGuestUserDisabled" 2020-06-09 16:48:33 +00:00
Hui Yu
ed8333a132 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 am: bb97cab3ce am: 7741f96d0b am: b5778ec4b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: I622183cac721cc016dbeafe0de543c21ecb61cfb
2020-06-09 05:54:08 +00:00
Hui Yu
b5778ec4b0 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 am: bb97cab3ce am: 7741f96d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: I172f8156883d4e4c22560755e5bb6d7d0bd3c652
2020-06-09 05:40:25 +00: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
83ebf36a81 Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2 am: d853673b5c am: 1d930502f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I5fc69b553035d1de9932776ee98f5ecc999723b0
2020-06-09 01:09:13 +00:00
Joanne Chung
d853673b5c Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I229a595052b53349a6a6ddab4df888e219afb5ef
2020-06-09 00:48:26 +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
acf97b902d Merge "Revert "Use permissionController name rather than hardcode"" into rvc-dev-plus-aosp am: 3ff65c2dfd am: d2ff0b9855 am: f8d1b105b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795379

Change-Id: I2ae9e78387248d13630d5a176683a17e6aa273d9
2020-06-08 20:13:46 +00: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
1e6eea2617 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858 am: 2b2fb4e5fc am: 78c218618c am: 425c1973b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: I878f57a19c28fa062c5adf579e5184c0ee7e5e40
2020-06-08 04:41:45 +00:00