Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
746,862 Commits 3 Branches 0 Tags
8fa9512f914c93df8dfd2c8b11be4e6018baefea
Commit Graph

746862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8fa9512f91 Merge "Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d am: badc5c5ef4 am: 07fd16cd7d" 2022-02-12 07:01:12 +00:00
Darrell Shi
cc89d0bcbc Merge "Monitor add callback uniqueness." 2022-02-12 07:01:03 +00:00
Treehugger Robot
ca97311326 Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d am: badc5c5ef4 am: 07fd16cd7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971299

Change-Id: I0363840734d671b0d68823109211d31035d8ba4f
 2022-02-12 07:00:53 +00:00
Treehugger Robot
07fd16cd7d Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d am: badc5c5ef4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971299

Change-Id: I13d9a513a437151a6a369fa124811ae9ba721f75
 2022-02-12 06:49:07 +00:00
Kathy Chen
663ddef4e7 Merge "Fix a bug where after the client calls startConsentActivity(), the framework is not loading the test activity as expected. Add permission to shell for cts test." 2022-02-12 06:38:14 +00:00
Treehugger Robot
badc5c5ef4 Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971299

Change-Id: Ic2c9be9573e5574e7931d7dcd21701d00f4c9a14
 2022-02-12 06:35:13 +00:00
Shawn Lin
a0b98ebfd9 Merge "Support hwc screen decoration layer" 2022-02-12 06:33:53 +00:00
Treehugger Robot
d54fb9484d Merge "Carrier config for opportunistic eSIM download only over WiFi" 2022-02-12 06:18:55 +00:00
TreeHugger Robot
5aee8c5d8f Merge "Remove QQS brightness controller" 2022-02-12 05:53:39 +00:00
Lorenzo Colitti
3445cdb0bf [automerger skipped] Merge "Expose EthernetManager state and control APIs." am: 212e17e6ac am: 5a9c79ec98 am: 42974f8348 -s ours 
am skip reason: Merged-In I88240a546ab51d128ed83775499f2bcabab74db0 with SHA-1 a968c3b109 is already in history

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

Change-Id: I1db4f8620e48bc73c5aa68556bee7b7a55c9c12f
 2022-02-12 05:40:29 +00:00
TreeHugger Robot
a52cd1070a Merge "Define BundleSession for MediaMetrics" 2022-02-12 05:40:03 +00:00
Hui Yu
ef8c121803 Merge "Defer LOCKED_BOOT_COMPLETED and BOOT_COMPLETED broadcasts." 2022-02-12 05:29:53 +00:00
Lorenzo Colitti
42974f8348 Merge "Expose EthernetManager state and control APIs." am: 212e17e6ac am: 5a9c79ec98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1968559

Change-Id: I5a487f0f15293e89b480feba4ca73f8e207f382b
 2022-02-12 05:24:19 +00:00
TreeHugger Robot
d52a542013 Merge "Use colorSurface for toast backgrounds" 2022-02-12 05:17:14 +00:00
Lorenzo Colitti
5a9c79ec98 Merge "Expose EthernetManager state and control APIs." am: 212e17e6ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1968559

Change-Id: I4ee521da4bc1e71fd577092ef6313d048f253663
 2022-02-12 05:04:55 +00:00
Lorenzo Colitti
212e17e6ac Merge "Expose EthernetManager state and control APIs." 2022-02-12 04:38:33 +00:00
TreeHugger Robot
b32e148d59 Merge "camera2: Add Mandatory stream combinations for PREVIEW_STABILIZATION." 2022-02-12 04:19:51 +00:00
TreeHugger Robot
ab4e525562 Merge "User switcher - Fix broken user addition" 2022-02-12 04:06:50 +00:00
TreeHugger Robot
5a290d0b4d Merge "Remove KeyValuePair logging" 2022-02-12 03:53:38 +00:00
Treehugger Robot
75481cc019 Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" am: 7258ba537d am: e102015259 am: 42ace7b2e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906212

Change-Id: Ib1555b1e6530dd01116788397ed3edd5626aaf85
 2022-02-12 03:41:44 +00:00
Treehugger Robot
42ace7b2e3 Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" am: 7258ba537d am: e102015259 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906212

Change-Id: I3bb39073516dd8f1a0a6e382687487b3c9f80d7d
 2022-02-12 03:24:53 +00:00
Treehugger Robot
e102015259 Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" am: 7258ba537d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906212

Change-Id: I06310275cae07918c046407f4b92a06023201c60
 2022-02-12 03:06:38 +00:00
TreeHugger Robot
b39511223b Merge "Add TranscodingSession and EditingSession to MediaMetricsManager" 2022-02-12 03:00:58 +00:00
TreeHugger Robot
698426a8d8 Merge "SurfaceView: Clean up synchronized changes with applyTransactionOnVriDraw" 2022-02-12 02:53:19 +00:00
Jing Ji
b60a625fa6 Merge "Exclude the bg battery usage for apps with access to fine location" 2022-02-12 02:47:33 +00:00
Treehugger Robot
7258ba537d Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" 2022-02-12 02:45:13 +00:00
Sharon Su
66b601d800 Merge "Add role protection level to android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION" 2022-02-12 02:35:03 +00:00
TreeHugger Robot
16a227c1a4 Merge "Add getPackageName to VoiceInteractor" 2022-02-12 02:29:50 +00:00
TreeHugger Robot
3085b04706 Merge "Add new intro attributes for accessibility" 2022-02-12 02:23:58 +00:00
Jing Ji
42a61716be Merge "Don't prompt on bg abuse if the app has a FGS with notification" 2022-02-12 02:17:58 +00:00
Kweku Adams
7dd1109928 Merge "Exempt backup jobs for media cloud provider." 2022-02-12 01:55:53 +00:00
Sudheer Shanka
a47a5ae532 Merge "Verify PACKAGE_USAGE_STATS permission of broadcast source uid." 2022-02-12 01:51:22 +00:00
Evan Severson
92035b43d2 Merge "Show mic dialog when phone call is started" 2022-02-12 01:49:11 +00:00
Songchun Fan
1afa0af5e3 Merge "[pm] remove SharedUserSetting from PackageSetting" 2022-02-12 01:39:22 +00:00
TreeHugger Robot
6b656f58c4 Merge "Fix a T -> T restore issue" 2022-02-12 01:28:56 +00:00
Maurice Lam
0c2e7a632d Merge "Expand comments for READ_NEARBY_STREAMING_POLICY" 2022-02-12 01:24:21 +00:00
TreeHugger Robot
1ee5e0e799 Merge "Add dump to FgsManagerController" 2022-02-12 01:15:23 +00:00
TreeHugger Robot
b718011948 Merge "Account for session phase out." 2022-02-12 00:40:27 +00:00
Yuntao Xu
cd15c07bfa Merge "Convert CanvasCompare/Android.mk to Android.bp" am: 17da00b993 am: 8aa558e2dc am: 8b20c4f8d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970059

Change-Id: I103baf5fb017f71959c1da02d88a1730d66a8151
 2022-02-12 00:36:13 +00:00
TreeHugger Robot
f0e5437568 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours am: 50950b8adc -s ours am: 66694f7156 -s ours am: 264cc3d18e -s ours am: 21875fd032 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc9b036e83cd71913500c9488a534262bfcf2f9a
 2022-02-12 00:35:22 +00:00
Yuntao Xu
8b20c4f8d4 Merge "Convert CanvasCompare/Android.mk to Android.bp" am: 17da00b993 am: 8aa558e2dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970059

Change-Id: Ia4f9fe509a12951943a195642ae6e7f026379ad1
 2022-02-12 00:24:58 +00:00
TreeHugger Robot
21875fd032 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours am: 50950b8adc -s ours am: 66694f7156 -s ours am: 264cc3d18e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07aa3bb4cc242ca71c854361b2e1c6b46bcd0a9e
 2022-02-12 00:18:19 +00:00
Yuntao Xu
8aa558e2dc Merge "Convert CanvasCompare/Android.mk to Android.bp" am: 17da00b993 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970059

Change-Id: Ia10f0039119ed2fa6686db4cac771b363a9169c5
 2022-02-12 00:08:39 +00:00
TreeHugger Robot
92adbe6a25 Merge "Added RemoveResult annotation to RemoveUserWhenPossible call" 2022-02-12 00:05:39 +00:00
Rubin Xu
0d53729785 Merge "Remove SecurityLog.writeEvent(String)" 2022-02-12 00:02:33 +00:00
TreeHugger Robot
264cc3d18e [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours am: 50950b8adc -s ours am: 66694f7156 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d96242db723bd36a9e393ff50a1f5be94e0b741
 2022-02-11 23:58:37 +00:00
Adam Bookatz
aa804f9749 Merge "UserManager.getProfileType hidden API and caching" 2022-02-11 23:58:05 +00:00
Yuntao Xu
f653a61f5d Merge "Convert SimpleCamera/Android.mk to Android.bp" am: 2cd74cf430 am: 81b7ee70f6 am: b5bb0d8ae0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969919

Change-Id: I015558317f54263a8b52fe526f7f23f1020c69e7
 2022-02-11 23:55:45 +00:00
Yuntao Xu
17da00b993 Merge "Convert CanvasCompare/Android.mk to Android.bp" 2022-02-11 23:51:34 +00:00
TreeHugger Robot
477653aa6b [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours am: 50950b8adc -s ours am: aba2d73507 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a11c4634ac18dd64979a225f72fbc7303ef78a5
 2022-02-11 23:48:50 +00:00