Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,143 Commits 3 Branches 0 Tags
21ddfb5a16ee4d7d06d9f605ec709ea13e868708
Commit Graph

18242 Commits

Author SHA1 Message Date
Treehugger Robot
fc99d35ccf Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b
 2020-07-27 13:43:16 +00:00
Jing Ji
ec8b28277b Merge "Java docs update: Advise not to include PII in setProcessStateSummary" into rvc-dev am: fcaa94e2dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202766

Change-Id: Ic02eba2cecd33c8bd607360e111e891f24b6ab34
 2020-07-23 22:06:47 +00:00
Julia Reynolds
100ea3d3f0 Remove gendered language 
Test: atest
Bug: 161908447
Change-Id: Ie331cf630b94e600326e77dfa81d01fb3f8627f6
 2020-07-23 13:04:05 -04:00
Jing Ji
3bda3bf8c6 Java docs update: Advise not to include PII in setProcessStateSummary 
Bug: 161812603
Test: m -j offline-sdk-docs & manual verify the javadoc
Change-Id: I741bbf7b83badcd7f1610f31bbd41a49b8b975fb
 2020-07-22 11:03:30 -07:00
Rubin Xu
ac51bf8a40 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain 
This change includes the following commits that are related to
CertInstaller and KeyChain:

7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
 2020-07-15 15:50:14 +01:00
Jing Ji
207e715943 Merge "Fix javadoc error in ApplicationExitInfo#getDefiningUid()" into rvc-dev am: 42ef19d57c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118644

Change-Id: I2a3a7609ca76fb24c5298589951b1cc3d4634c3d
 2020-07-09 18:13:59 +00:00
Jing Ji
42ef19d57c Merge "Fix javadoc error in ApplicationExitInfo#getDefiningUid()" into rvc-dev 2020-07-09 18:11:00 +00:00
Jing Ji
219da992ad Fix javadoc error in ApplicationExitInfo#getDefiningUid() 
Bug: 160875447
Test: m -j offline-sdk-docs & manual verify the javadoc
Change-Id: Iae09584b42990092166be3c9a2bb792fa2d0abef
 2020-07-09 09:33:10 -07:00
Charles Chen
8d53c79a02 Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605da0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105622

Change-Id: Ic5670956e2cec2fd6e63a9d0e6c4fa86f2ec991e
 2020-07-08 17:59:55 +00:00
Charles Chen
3b8e8d7631 Fix NPE when invoking Context#isUiContext 
Add null checks in both ContextWrapper and before obtaining
ContextImpl#getOuterContext.

Test: atest ContextTest#testIsUiContext_ContextWrapper
fixes: 160037462
Change-Id: Ic6a71dd9ac4b195d219d6e5431f2f2b199a400fa
 2020-07-08 23:58:58 +08:00
TreeHugger Robot
e7322068cc Merge "Fix Bundle#getParcelableArray call" into rvc-dev am: d70c7dda50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034230

Change-Id: I18687d77b5383d35b5cd079345be1cbac64dd532
 2020-07-03 02:40:20 +00:00
TreeHugger Robot
d70c7dda50 Merge "Fix Bundle#getParcelableArray call" into rvc-dev 2020-07-03 02:22:57 +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
Treehugger Robot
2f3b72b8ef Merge "Clean up old references to android.support in Activity and Fragment" 2020-07-01 19:57:53 +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
Tadashi G. Takaoka
c4a13e9b0b Fix Bundle#getParcelableArray call 
Because Bundle.getParcelableArray() returns Parcelable[] object,
simply casting a return value to a typed array will cause
ClassCastException.

Bug: 158584842
Bug: 160120833
Test: manually install ArcNotificationTest2 and try inline reply
Change-Id: Idd8eaa412925ac826590d44a0db297aacef806d8
 2020-06-30 14:18:49 +09: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
Aurimas Liutikas
1c7cc22adf Clean up old references to android.support in Activity and Fragment 
Bug: 158760874
Change-Id: Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa
Merged-In: Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa
 2020-06-29 23:27:48 +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
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
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
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
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
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
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
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
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
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
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
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
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