Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,966 Commits 3 Branches 0 Tags
4e593f7fd5a2fc90130df3bf3cc5692d169aa95e
Commit Graph

18764 Commits

Author SHA1 Message Date
TreeHugger Robot
99b1d3da0f Merge "Revert "Enable IMS and its config context to obtain UI component"" into rvc-dev am: 9e7c46190a am: 213be87921 am: 3243b12ac8 am: 8a7ed76dcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988595

Change-Id: Ic0648b1764161291c083e83662fcf0c2dd856396
 2020-06-25 01:16:21 +00:00
TreeHugger Robot
213be87921 Merge "Revert "Enable IMS and its config context to obtain UI component"" into rvc-dev am: 9e7c46190a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988595

Change-Id: I120e7328f1fe8a72292f73ca07320d02b5587554
 2020-06-25 00:47:34 +00:00
TreeHugger Robot
9e7c46190a Merge "Revert "Enable IMS and its config context to obtain UI component"" into rvc-dev 2020-06-25 00:41:07 +00:00
Evan Severson
80a13bce0d Merge "Implement permission revoke with reason" into rvc-dev am: cee666eba9 am: 8ce472840e am: ebd42f9dd3 am: df1adc879d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959996

Change-Id: I352500452191b1a012ec486a8474c1210fbc9ea1
 2020-06-24 23:55:19 +00:00
Evan Severson
8ce472840e Merge "Implement permission revoke with reason" into rvc-dev am: cee666eba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959996

Change-Id: I90ba41d75359c462c163b70aad470b85c4843915
 2020-06-24 23:14:47 +00:00
Alistair Delva
71b8a0456c Revert "Enable IMS and its config context to obtain UI component" 
Revert "Verify IMS to get display and WM"

Revert submission 11823238-ims_ui_context

Reason for revert:
Broke the following tests:
android.os.cts.StrictModeTest#testIncorrectContextUse_GetDisplay
android.os.cts.StrictModeTest#testIncorrectContextUse_GetSystemService
android.os.cts.StrictModeTest#testIncorrectContextUse_GetViewConfiguration
But was submitted with a bypass.

Reverted Changes:
I688b46a92:Verify IMS to get display and WM
I172ceb2e1:Enable IMS and its config context to obtain UI com...

Bug: 157027563
Bug: 159795597
Change-Id: Id309faac0ac8f60ee0d92c26767a89f450ddc455
 2020-06-24 22:31:53 +00:00
Makoto Onuki
42bec243c0 Remove unnecessarily @System/TestApi annotations 
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Exempt-From-Owner-Approval:Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
Change-Id: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
 2020-06-24 18:02:10 +00:00
Evan Severson
aacd48b0bc Implement permission revoke with reason 
The reason is passed to app exit info so a given app can get more
information about why their app was killed in the event of permission
revoke.

Test: atest RevokePermissionTest ActivityManagerAppExitInfoTest#testPermissionChangeWithReason
Fixes: 159659620
Change-Id: Id711667eb2c1579ecb2a1b83a62af3cc7862d5f6
 2020-06-24 10:03:54 -07:00
Makoto Onuki
b319264289 Merge "Remove unnecessarily @System/TestApi annotations" 2020-06-24 15:07:15 +00:00
Charles Chen
98fec6e684 Merge "Enable IMS and its config context to obtain UI component" into rvc-dev am: 8655743001 am: e3138eca89 am: dc26be9316 am: 771804d66e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818544

Change-Id: Icc576f42e8209c1178013116c2f68e3e66f4a89d
 2020-06-24 04:20:44 +00:00
Charles Chen
dc26be9316 Merge "Enable IMS and its config context to obtain UI component" into rvc-dev am: 8655743001 am: e3138eca89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818544

Change-Id: I2e820a5300bb6fb4e7d0f4444c09cad4a2d0a9c5
 2020-06-24 03:51:10 +00:00
Charles Chen
ef613e3aad Merge "Enable IMS and its config context to obtain UI component" into rvc-dev am: 8655743001 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818544

Change-Id: I4193edaaafb74607205189a521392e25981c9d43
 2020-06-24 03:37:25 +00:00
Charles Chen
8655743001 Merge "Enable IMS and its config context to obtain UI component" into rvc-dev 2020-06-24 03:33:53 +00:00
Makoto Onuki
4290301e85 Remove unnecessarily @System/TestApi annotations 
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Change-Id: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
 2020-06-23 10:51:50 -07:00
Jeff Sharkey
49d152a711 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf am: 5c4203f396 am: 0197a6d5e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I6e8e09a2ebb762248d1067967adb16c07f411333
 2020-06-23 17:06:49 +00:00
Jeff Sharkey
0197a6d5e6 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf am: 5c4203f396 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I4223e9fdb016bbdfbd075fce757744bd9fa25f35
 2020-06-23 16:47:02 +00:00
Jeff Sharkey
eac11fa9c4 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I27c7f67dcbdbf5371c3ebc7cf9e955c7b695b700
 2020-06-23 16:34:52 +00:00
Jeff Sharkey
157bd31af9 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I2c67138e54e1fb6c5149317c960a2727aef64e98
 2020-06-23 16:22:56 +00:00
TreeHugger Robot
9bc8e57bbe Merge changes from topic "featureIdCleanup" 
* changes:
  Do not allow invalid attribution tags
  Remove legacy support for "featureId".
 2020-06-23 16:20:57 +00:00
Jeff Sharkey
38a6333ff6 Merge "Override MIME type to match MediaStore behavior." into rvc-dev 2020-06-23 15:56:44 +00:00
Jeff Sharkey
83aaf908a6 Override MIME type to match MediaStore behavior. 
Internally, DownloadManager synchronizes its contents with MediaStore,
which relies heavily on using file extensions to determine MIME types.

To prevent these two databases from getting confused, this change
adjusts DownloadManager to force the MIME type of already-completed
downloads based on the file extension, matching what MediaStore does.

Bug: 159594536
Test: atest PublicApiAccessTest#testAddCompletedWithoutExtension
Change-Id: I60c613eafcfe55007dffcac2d7d1fe375b753c19
 2020-06-23 07:13:13 -06:00
Issei Suzuki
89983c49b0 Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0 am: 34e1bd049d am: cec5f1e901 am: e621d1ac79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: If39eac860c4d461660333aa55df3539218fa2564
 2020-06-23 12:42:54 +00:00
Issei Suzuki
cec5f1e901 Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0 am: 34e1bd049d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: I404a2e8ee40c8768aac88c3dc39c1317a7cb2def
 2020-06-23 12:17:49 +00:00
Issei Suzuki
99722aad6d Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: Idc8047b94dfdd52bd719a2a4b711b2d654fd1a56
 2020-06-23 11:59:08 +00:00
Issei Suzuki
16868fbef0 Merge "Update virtual display size before turning it on." into rvc-dev 2020-06-23 11:46:16 +00:00
Kweku Adams
2a365580c0 Merge "Disable restricted bucket." into rvc-dev am: 6cca001863 am: aea41aec2b am: ebba61330d am: 303ddce2ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740346

Change-Id: I105331902d59d2f56f30ebbaaaf45680bdc72f20
 2020-06-23 01:07:14 +00:00
Kweku Adams
aea41aec2b Merge "Disable restricted bucket." into rvc-dev am: 6cca001863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740346

Change-Id: If3eb3f5bcb9b99e3bed7f89ba03048bb8f7d3f05
 2020-06-23 00:18:30 +00:00
Kweku Adams
6cca001863 Merge "Disable restricted bucket." into rvc-dev 2020-06-23 00:13:41 +00:00
Michael Groover
7032cfbe9f Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c am: 64baddcb32 am: cbbc274eef am: dcfb58ce63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: Ib39318aadd8caca0689ba2d09932eb2119990926
 2020-06-22 20:17:16 +00:00
Michael Groover
dcfb58ce63 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c am: 64baddcb32 am: cbbc274eef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: Iac86f4af0953a45eb934e64e01ced4bad153aac9
 2020-06-22 19:50:37 +00:00
Charles Chen
d2fd037ab3 Enable IMS and its config context to obtain UI component 
Test: atest StrictModeTest
Bug: 157027563

Change-Id: I172ceb2e17722a7cba917a6e3a808d7559cad3e0
 2020-06-23 03:45:17 +08:00
Michael Groover
b9e3d1a84c Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I627d3015c0e2cad832a8fd9926fc2079241bd9cd
 2020-06-22 19:31:31 +00:00
Michael Groover
2bcb70322c Merge "Update docs for methods that require subscriberId" into rvc-dev 2020-06-22 19:30:10 +00:00
Hongwei Wang
07a5e3f2b4 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: 4cac31dde3 am: 29afe59ac4 am: c0643da38f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I7b3fed3f60e3e6f10ce4cebb4a777a4f5e5b819b
 2020-06-22 19:13:38 +00:00
Hongwei Wang
4cac31dde3 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: Ic4d994aa3635098e269dc3e198a96ad84f976910
 2020-06-22 18:27:57 +00:00
Hongwei Wang
997150ee0a Merge "Updates enterPictureInPicture API doc" into rvc-dev 2020-06-22 18:14:10 +00:00
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
b234c0a600 Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: I8fc36dcc5d7a1769e302735a1a613356329926ff
 2020-06-22 08:25:18 +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
35b794f35e Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9eb11d6ad4f4583269811ba77e8aa4b76f17c3e0
 2020-06-22 03:18:55 +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
Philip P. Moltmann
a51c2ef3ea Do not allow invalid attribution tags 
Fixes: 151105954
Test: atest CtsAppOpsTestCases
Change-Id: I2b210172bd042300cc8aa54edf3f68b6aa3420fe
 2020-06-19 19:57:27 -07:00
Michael Groover
f4f6a7adac Update docs for methods that require subscriberId 
In Android 10 additional restrictions were required to access the
subscriberId. The NetworkStatsManager has several methods that accept
a subscriberId of the mobile network for which usage should be queried.
This commit updates the docs for these methods to reference the new
access restrictions and offer null as an option to obtain the usage
for all mobile networks.

Fixes: 157871064
Test: m docs
Change-Id: I95c730c9418fced6312eb3ba4e0d69e6299f3ded
 2020-06-19 19:48:07 -07: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