Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
633,347 Commits 3 Branches 0 Tags
cfb4fa83d2eb4dc14084fd591f36359d5a510ea3
Commit Graph

633347 Commits

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

Change-Id: Ie12735372b459014c288c9b3e048b1bfe05754f6
 2021-04-01 03:20:11 +00:00
Jimmy Chen
ad9eed435a Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6 am: 4f1799e6c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I2ca33f91ce7dd7aa7b293e4d9e2d38177e0e9dfb
 2021-04-01 03:19:47 +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
936b515714 Merge "Fix aapt2 feature split package name generation" into sc-dev 2021-04-01 03:00:54 +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
Jimmy Chen
5fe022de71 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: 62e79738c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: Ib1525a770c4f174e12b5d31c527279201019ada4
 2021-04-01 02:35:40 +00:00
Jimmy Chen
62e79738c3 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: I38dca494da96afdf2932c94914ba6fce412f308e
 2021-04-01 02:35:27 +00:00
Jimmy Chen
4f1799e6c8 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I128bd35ad9dea6d9085f746790af2c1bc2344b47
 2021-04-01 02:35:18 +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
b82251a5ff Merge "Update some BiometricManager default prompt messages" into sc-dev 2021-04-01 01:45:15 +00:00
Jimmy Chen
e851fc58d6 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev 2021-04-01 01:42:28 +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
9ad3b820be Merge "DisplayLayout set() include copy new mNavBarFrameHeight" into sc-dev 2021-04-01 00:31:22 +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
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
af4aea5f95 Merge "Update some Package Installer strings." into sc-dev 2021-03-31 23:10:32 +00:00
Seigo Nonaka
8192e2690a Merge "Override isRestricted for preventing unexpected resource loading" into rvc-qpr-dev am: 39c49f8daa am: 0b8ee8ecc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855846

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

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

Change-Id: Ie04c3faf2011718784b36dcc7249bbca1698f08c
 2021-03-31 23:02:00 +00:00
TreeHugger Robot
279253f0fc Merge "Stretch breaks on wembley" into sc-dev 2021-03-31 22:50:03 +00:00
Josh Tsuji
396acbc6a7 Merge "Fade in notifications on wakeup." into sc-dev 2021-03-31 22:48:07 +00:00
Treehugger Robot
64c20457e2 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I95596d0d596cdebdd64c61094da6c4e5083fc95d
 2021-03-31 22:47:18 +00:00
Treehugger Robot
222b1e4ad7 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." 2021-03-31 22:44:25 +00:00
Jack Yu
f7a4c40e88 Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: Ibb38cafd12c3ce68b7b75bef2af4565ba4ff6213
 2021-03-31 22:44:06 +00:00
Zhen Zhang
bf5667bec6 Merge "Persist user-agnostic lastTimeAnyComponentUsed in disk" into sc-dev 2021-03-31 22:43:53 +00:00
Treehugger Robot
131557b166 Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

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

Change-Id: I624bd5a9fcecf731c34d80930a4593e10e390f5a
 2021-03-31 22:43:01 +00:00
Suprabh Shukla
c9b05d56ec Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: I716890b1950fd131357522c24cabec5db9b5127e
 2021-03-31 22:42:44 +00:00
Benedict Wong
24d8a37c70 Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe am: f20f1b0897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: I5b52782e9e741421e57189e58faa75005baa7ff7
 2021-03-31 22:41:53 +00:00
Hall Liu
ff4a4a29e7 Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358163

Change-Id: I30c6340d335e738b016d1f69f6461951d42b631c
 2021-03-31 22:41:23 +00:00
Seigo Nonaka
0b8ee8ecc3 Merge "Override isRestricted for preventing unexpected resource loading" into rvc-qpr-dev am: 39c49f8daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855846

Change-Id: If44737735289f45e9cc30fc3c9498e591b479fa3
 2021-03-31 22:40:50 +00:00
Hall Liu
2e0c2171fd Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" 2021-03-31 22:38:53 +00:00