Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,824 Commits 3 Branches 0 Tags
2d00aa59ff6923c05fa51dcdcc2c7df5acade326
Commit Graph

638824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jimmy Chen
2d00aa59ff Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: cd05cf4aa7 am: 0eec50702d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: Ibbecedaa762e3db8231ffcc77949a477c98cdc5a
 2021-04-01 03:37:42 +00:00
Jimmy Chen
0eec50702d Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: cd05cf4aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: I9cd1a445d4758ef2c0bef72ebbce92d202462961
 2021-04-01 03:18:27 +00:00
Ryan Mitchell
4e1e356758 Merge "Fix aapt2 feature split package name generation" into sc-dev am: 936b515714 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14035668

Change-Id: Ie23323ce7133e002c9b897fa787a3f06b42c93a9
 2021-04-01 03:14:30 +00:00
Ryan Mitchell
936b515714 Merge "Fix aapt2 feature split package name generation" into sc-dev 2021-04-01 03:00:54 +00:00
Remi NGUYEN VAN
8003fdc743 Merge "Add framework-connectivity-test-defaults" into sc-dev am: f8365783ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14029485

Change-Id: Ia76c84216aef7a830a4e105b21711f1186a037a9
 2021-04-01 02:54:40 +00:00
Remi NGUYEN VAN
f8365783ff Merge "Add framework-connectivity-test-defaults" into sc-dev 2021-04-01 02:43:26 +00:00
Jimmy Chen
cd05cf4aa7 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: I0e02f1d3d7ab499b605354725792a02c0749aec9
 2021-04-01 02:40:12 +00:00
Vadim Tryshev
7e58dae033 Merge "Revert "Enable new ripple"" into sc-dev am: f2ab932abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054280

Change-Id: I60c37c9d61d60c854b465389aa975a58a286b1de
 2021-04-01 02:38:33 +00:00
TreeHugger Robot
f149e345a8 Merge "Disable overscroll" into sc-dev am: 82cb4c5dc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022328

Change-Id: I62a1ba6af57b86231660448a903ace336074d585
 2021-04-01 02:38:00 +00:00
Bill Lin
aa83cc4fe8 Merge "1/ Make One handed mode support multiple user switch" into sc-dev am: f9d740b0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13851605

Change-Id: I855e7ece30235a85b82a5903bee6d2f9d0ebac02
 2021-04-01 02:37:25 +00:00
TreeHugger Robot
66460cb97d Merge "Allow to report finsh/pause state if Activity isn't resume." into sc-dev am: c5547caafb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14031651

Change-Id: I2b75ec475bb8a2b0eb86a885e859633858112f80
 2021-04-01 02:36:03 +00:00
Vadim Tryshev
f2ab932abf Merge "Revert "Enable new ripple"" into sc-dev 2021-04-01 02:26:37 +00:00
TreeHugger Robot
82cb4c5dc4 Merge "Disable overscroll" into sc-dev 2021-04-01 02:05:30 +00:00
Lyn Han
e153d82a7e Disable overscroll 
Test: manual
Change-Id: Id3b2c13701e75cadb4e083f63756f834f2cf289f
 2021-04-01 02:05:27 +00:00
Bill Lin
f9d740b0dc Merge "1/ Make One handed mode support multiple user switch" into sc-dev 2021-04-01 02:02:39 +00:00
TreeHugger Robot
c5547caafb Merge "Allow to report finsh/pause state if Activity isn't resume." into sc-dev 2021-04-01 02:00:35 +00:00
TreeHugger Robot
3b99d4919a Merge "Update some BiometricManager default prompt messages" into sc-dev am: b82251a5ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14058107

Change-Id: Ied27e3307a602aff19f2d947e7e1d012d8dd660b
 2021-04-01 01:53:24 +00:00
Amy Zhang
057c08a71e Merge "Rename IS_MISO and IS_SHORT_FRAME constants name to align with the getter" into sc-dev am: 026e109c50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054065

Change-Id: Iafd9bf6533a5b3c7f183c8f685ab7593da8d28ed
 2021-04-01 01:52:30 +00:00
TreeHugger Robot
b82251a5ff Merge "Update some BiometricManager default prompt messages" into sc-dev 2021-04-01 01:45:15 +00:00
Jimmy Chen
3d6cf521c1 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev 2021-04-01 01:42:20 +00:00
Amy Zhang
026e109c50 Merge "Rename IS_MISO and IS_SHORT_FRAME constants name to align with the getter" into sc-dev 2021-04-01 01:22:39 +00:00
Vadim Tryshev
cd26c64db7 Revert "Enable new ripple" 
Revert "Temporarily force test on a device"

Revert submission 13921422-enable_next_ripple

Reason for revert:
The revert fixes the leak b/183950010.
Proof:
* Running last good build + the CL we are reverting results in the leak.

* The revert was tested on Bonito. The result without the revert is failing: https://android-build.googleplex.com/builds/tests/view?invocationId=I95600008189690647&redirect=https%3A%2F%2Fsponge2.corp.google.com%2Fceb67817-a049-41f8-b127-719a8b4fec50&testPackage=com.android.launcher3.ui

The result of TOT + revert (https://android-build.googleplex.com/builds/branch-dashboard/git_master?build_id=P21324441) is passing:
https://android-build.googleplex.com/builds/forrest/run/L11500000848549427

Reverted Changes:
I928ba73c9:Enable new ripple
I17393431a:Temporarily force test on a device

Change-Id: I865e05c2c569202f6e8ab545936c1b74db6a18f7
Bug: 183950010
Test: presubmit, forrest
 2021-04-01 01:10:57 +00:00
Bill Lin
cb3ed65258 Merge "DisplayLayout set() include copy new mNavBarFrameHeight" into sc-dev am: 9ad3b820be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14024689

Change-Id: I2ddaa076142c8d27d3c92070fdb4ec177e7730d6
 2021-04-01 00:50:14 +00:00
Bill Lin
9ad3b820be Merge "DisplayLayout set() include copy new mNavBarFrameHeight" into sc-dev 2021-04-01 00:31:22 +00:00
TreeHugger Robot
277b6a507e Merge "Update doc to reflect actual permission" into sc-dev am: 75b795f4a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040170

Change-Id: Ia0e20c5abf6ad3650d8670a235e2ce1333ee291e
 2021-04-01 00:28:08 +00:00
TreeHugger Robot
1c08b0f9d5 Merge "Fix an app data removal issue during OTA update" into sc-dev am: 4a63b26d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743004

Change-Id: I4053affcc72894a8d25b025dcb60280e3ed30249
 2021-04-01 00:27:09 +00:00
TreeHugger Robot
75b795f4a3 Merge "Update doc to reflect actual permission" into sc-dev 2021-04-01 00:11:26 +00:00
TreeHugger Robot
4a63b26d32 Merge "Fix an app data removal issue during OTA update" into sc-dev 2021-03-31 23:58:59 +00:00
Yan Wang
3f07bcb594 Merge "Fix the resolving of apk type." into sc-dev am: 72e35e6a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14055311

Change-Id: Ic349f14d068cc590d6a7f218c401ba1b49b4b5d9
 2021-03-31 23:52:06 +00:00
Edward Cunningham
23fee6f344 Merge "Show indeterminate progess when installing." into sc-dev am: 2775c48d14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056945

Change-Id: I17223bd972d0a0c90ec1e6149363228fc161383a
 2021-03-31 23:51:23 +00:00
Lucas Dupin
7473656484 Merge "Make ripple sparkles less prominent" into sc-dev am: f8dc7809a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14055875

Change-Id: I3320d7fd2eaf79a4d4ce6a7c6aec89ce52abff03
 2021-03-31 23:51:10 +00:00
Treehugger Robot
6b71868dd2 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7 am: 64c20457e2 am: 939a1ea148 am: 1937317a1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: Id9dfa05de0f340610b4e928a9c26503fee8ec57e
 2021-03-31 23:51:01 +00:00
Hall Liu
84a68871e3 Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd am: ff4a4a29e7 am: 9c05c40060 am: 1b53c7b5e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358163

Change-Id: I0172fb9be021b43e4bb6c72b5222e259cc6a61a7
 2021-03-31 23:50:22 +00:00
Jack Yu
74342d0f65 Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 am: f7a4c40e88 am: 8297a09b3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: I4b2ecd419af94443eab18b105dad3333505a6366
 2021-03-31 23:49:55 +00:00
Treehugger Robot
0f99af7ed8 [automerger skipped] Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a am: 131557b166 -s ours am: a6855438f8 -s ours 
am skip reason: skip tag Change-Id I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1 with SHA-1 a1245b1c7c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: Iddec548ccdfcf88fdaa1910f37edc9bd6b4c4760
 2021-03-31 23:49:26 +00:00
Alan Viverette
d33b8dd52b Merge "FIx issue: https://issuetracker.google.com/issues/183024999" am: 2e1c97a4e8 am: 095c053c3f am: 9ee35481d1 am: 5c15f94f79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645426

Change-Id: I8a6f6034c4b0b4213c8307da941c690d6f6fa0f1
 2021-03-31 23:48:59 +00:00
Suprabh Shukla
a4ed879693 [automerger skipped] Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 am: c9b05d56ec -s ours am: bffedcfa00 -s ours 
am skip reason: skip tag Change-Id I60e745c4ff32cbf8f8ff8b5d016555a25a065f39 with SHA-1 00967754c3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: I17ec4c722db915c8725dfb5e10748ba26e170157
 2021-03-31 23:48:36 +00:00
Benedict Wong
8a6df4facb Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe am: f20f1b0897 am: 24d8a37c70 am: 055acf8c2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: If89384b4a586f796e51fcff7391468779741295c
 2021-03-31 23:47:22 +00:00
Yan Wang
72e35e6a1a Merge "Fix the resolving of apk type." into sc-dev 2021-03-31 23:43:55 +00:00
Edward Cunningham
2775c48d14 Merge "Show indeterminate progess when installing." into sc-dev 2021-03-31 23:40:20 +00:00
Curtis Belmonte
b9020fe26e Update some BiometricManager default prompt messages 
Changes some strings returned by BiometricManager#getPromptMessage(int)
based on UX feedback.

Test: Manually logged strings from biometric test app

Bug: 180732913
Change-Id: I8c5ce217d4266b4a6649a7c18aa56dc4cc9110bd
 2021-03-31 16:32:37 -07:00
Lucas Dupin
f8dc7809a4 Merge "Make ripple sparkles less prominent" into sc-dev 2021-03-31 23:31:50 +00:00
Treehugger Robot
1937317a1d Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7 am: 64c20457e2 am: 939a1ea148 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I7144b96ad4887ea46a04eedc604421688295fee8
 2021-03-31 23:31:20 +00:00
Hall Liu
1b53c7b5e1 Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd am: ff4a4a29e7 am: 9c05c40060 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358163

Change-Id: Icf555d5e3bceda3bc1260b64c6d7394d4f9adb50
 2021-03-31 23:30:47 +00:00
Jack Yu
8297a09b3c Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 am: f7a4c40e88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: I9f1a24505b270989dd1d2dd575c19781054d798f
 2021-03-31 23:30:15 +00:00
Treehugger Robot
a6855438f8 [automerger skipped] Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a am: 131557b166 -s ours 
am skip reason: skip tag Change-Id I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1 with SHA-1 a1245b1c7c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I32efb73124006edc49206b039d74f91068c33ea7
 2021-03-31 23:29:44 +00:00
Alan Viverette
5c15f94f79 Merge "FIx issue: https://issuetracker.google.com/issues/183024999" am: 2e1c97a4e8 am: 095c053c3f am: 9ee35481d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645426

Change-Id: Idba06d2713407fff424eecf503066f902bee0924
 2021-03-31 23:28:57 +00:00
Suprabh Shukla
bffedcfa00 [automerger skipped] Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 am: c9b05d56ec -s ours 
am skip reason: skip tag Change-Id I60e745c4ff32cbf8f8ff8b5d016555a25a065f39 with SHA-1 00967754c3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: Ic088e14fe00de9e68b703640aded8985e8b19bb1
 2021-03-31 23:28:35 +00:00
Benedict Wong
055acf8c2e Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe am: f20f1b0897 am: 24d8a37c70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: Iba715b8e73710cab26f68396226b354c9ccfe9e4
 2021-03-31 23:27:50 +00:00
TreeHugger Robot
194b914514 Merge "Update some Package Installer strings." into sc-dev am: af4aea5f95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056565

Change-Id: Ia55718d48b4bd94c51f05d8f31152f9047a9f43b
 2021-03-31 23:25:26 +00:00