Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
568,654 Commits 3 Branches 0 Tags
82a951abc3fca618d4bb66aaa2113f9941602b5f
Commit Graph

18778 Commits

Author SHA1 Message Date
Charles Chen
82a951abc3 Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev am: 8deb612a14 am: f9ccadb06d am: 2712b5e401 am: 718528f4bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004931

Change-Id: I669e79f51cd8a2390c53308b30cbe1d94a3b39c5
 2020-07-02 00:28:39 +00:00
Charles Chen
f9ccadb06d Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev am: 8deb612a14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004931

Change-Id: Ied208126c1c21f736f07d4d7f24cb14c3a83c280
 2020-07-01 23:42:26 +00:00
Charles Chen
8deb612a14 Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev 2020-07-01 23:21:51 +00:00
Aurimas Liutikas
45b1a58bce Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp am: 47029fe43d am: 87e64b5698 am: 19bb58eb47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039663

Change-Id: I0e69615ea0540bbcc8d859493f1b1ea21b409e90
 2020-06-30 21:53:26 +00:00
Aurimas Liutikas
47029fe43d Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp 2020-06-30 21:16:33 +00:00
vichang
26ed852eaf Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e2301 am: 64937407f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346485

Change-Id: I5ded5092e4c7706f58417a5c97f3207524b44a95
 2020-06-30 17:23:46 +00:00
Victor Chang
2ea241f6ee Use new package name for ZoneInfo and libcore.timezone 
Bug: 141747409
Test: None
Merged-In: Id99a345ec024179295063c3644f72c062cb50554
Change-Id: Id99a345ec024179295063c3644f72c062cb50554
 2020-06-30 13:53:47 +01:00
Aurimas Liutikas
5d681da22c Clean up old references to android.support in Activity and Fragment 
Bug: 158760874
Change-Id: Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa
 2020-06-30 04:08:12 +00:00
Charles Chen
ba4ffa4a6d Revert "Revert "Enable IMS and its config context to obtain UI component"" 
Test: atest StrictModeTest
Bug: 157027563
Bug: 159795597
Change-Id: I2a1b3fefa0bd82eeaa507c08fc4a79fc9f4391c5
 2020-06-29 14:27:08 +00:00
Stanislav Zholnin
724c8858a6 Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev am: ebe2773f3d am: daf1861655 am: 6cf9be197f am: 420bc87fdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000934

Change-Id: Iac664d7ff4885c3ba6606aa46b6ffa9b92c9cb2e
 2020-06-27 02:38:11 +00:00
Stanislav Zholnin
6cf9be197f Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev am: ebe2773f3d am: daf1861655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000934

Change-Id: I3b5e54257f20e465efa60040972cc74203ab7983
 2020-06-26 10:15:19 +00:00
Stanislav Zholnin
1aa18194b7 Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev am: ebe2773f3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000934

Change-Id: Id8610d5f22070c32a5f491bde3205e29aa779859
 2020-06-26 09:58:51 +00:00
Stanislav Zholnin
ebe2773f3d Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev 2020-06-26 09:47:32 +00:00
Stanislav Zholnin
2a4f925537 Add testAppOps test to TEST_MAPPING. 
Approval are here: ag/11091388.

Test: atest UidAtomTests#testAppOps
Change-Id: I571e549f57968a83b32f5871994ea7b1b74be3d0
 2020-06-26 09:44:11 +00:00
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