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

746806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Antony Sargent
0b677034e7 Merge "KeyguardManager#isDeviceSecure()" 2022-02-11 23:47:34 +00:00
TreeHugger Robot
d5805cf8ca Merge "Exclude the dream cutomization activity from recents." 2022-02-11 23:47:15 +00:00
Nate Myren
cfb18d58f8 Merge "Check for fixed permissions when restoring notification permissions" 2022-02-11 23:39:52 +00:00
Yuntao Xu
b5bb0d8ae0 Merge "Convert SimpleCamera/Android.mk to Android.bp" am: 2cd74cf430 am: 81b7ee70f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969919

Change-Id: I833df30c9a662452d19361c3ac81614aef2b5a0d
 2022-02-11 23:37:02 +00:00
TreeHugger Robot
66694f7156 [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 skip reason: subject contains skip directive

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

Change-Id: I425d80d190d6f0b268af733b4281adbb0177eac1
 2022-02-11 23:36:44 +00:00
TreeHugger Robot
aba2d73507 [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 skip reason: subject contains skip directive

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

Change-Id: Ic181f1f0c19663099361bf7b080636ae7cd7ed9c
 2022-02-11 23:35:30 +00:00
Hongwei Wang
303d1d3bfb Merge "Disable failing PIP tests while checking the issue" 2022-02-11 23:31:15 +00:00
Yuntao Xu
81b7ee70f6 Merge "Convert SimpleCamera/Android.mk to Android.bp" am: 2cd74cf430 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969919

Change-Id: I43570670811abe217768ef373a5b2a8dba4ef1db
 2022-02-11 23:19:43 +00:00
TreeHugger Robot
50950b8adc [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 skip reason: subject contains skip directive

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

Change-Id: I456db8e70c2cc29245e1d5a5f55b62c0d5c572e2
 2022-02-11 23:18:13 +00:00
Yuntao Xu
2cd74cf430 Merge "Convert SimpleCamera/Android.mk to Android.bp" 2022-02-11 23:04:42 +00:00
TreeHugger Robot
413b806a7c [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 skip reason: subject contains skip directive

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

Change-Id: Ie2c4ec5f9a60a3b921681dd2b9b026e8713ad618
 2022-02-11 23:00:11 +00:00
Kweku Adams
12efc59838 Account for session phase out. 
It's possible for "time until quota is consumed" to be positive when
remaining time is 0 since TimingSessions may be phasing out of the
window. Properly account for that in the early returns.

Bug: 218216817
Test: atest FrameworksMockingServicesTests:QuotaControllerTest
Change-Id: I714b3f1bbdbb01c8d45e7b73bd5d2cfa16b29c4e
 2022-02-11 22:57:44 +00:00
TreeHugger Robot
2a6c047393 [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 skip reason: subject contains skip directive

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

Change-Id: I7cb0e66b4c5651c28a3cf38ac94c698737e25786
 2022-02-11 22:42:38 +00:00
TreeHugger Robot
d9a89e476c [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 skip reason: subject contains skip directive

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

Change-Id: I910c6754829f45d012104c992bcbc2a026622c1a
 2022-02-11 22:29:13 +00:00
Mayank Garg
362212f8ad Added RemoveResult annotation to RemoveUserWhenPossible call 
Bug: 215555912
Test: m
Change-Id: I82dff56942cbc576a1205e09b25fcc26f882b1d7
 2022-02-11 22:24:49 +00:00
TreeHugger Robot
6a4864ee21 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44b5939f05d3d4bb3f7d78e79e32403de64e47f1
 2022-02-11 22:12:20 +00:00
TreeHugger Robot
5e2939bd21 Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev 2022-02-11 21:55:06 +00:00
TreeHugger Robot
c16349a69d Merge "Revert "Query only necessary columns in ChooserActivity.extractF..."" 2022-02-11 21:35:54 +00:00
TreeHugger Robot
129a032374 Merge "speech: Fix builder plurality" 2022-02-11 21:28:48 +00:00
Rubin Xu
6a8ccfa6c1 Remove SecurityLog.writeEvent(String) 
Not used by anyone at the moment and could cause confusion with
the vararg overload, so removing.

Bug: 194988881
Test: atest MixedDeviceOwnerTest#testSecurityLoggingWithSingleUser
Change-Id: I73e64396bbbac69314ac26242f6e00ad1c9453ba
 2022-02-11 20:47:53 +00:00
Rubin Xu
b86ec0a5a4 Merge "Security log: additional events for WiFi and BLE connections" 2022-02-11 20:46:50 +00:00
Lyn Han
82212e908e Merge "Wrap short shelf width to icon count when less than lockscreen max" 2022-02-11 20:31:27 +00:00
Maciej Żenczykowski
4bfadd57b8 [automerger skipped] Merge "remove libbpf_android from libandroid_runtime" am: 26712e3c89 am: 8b6bb2039a am: ee83bd3acc -s ours 
am skip reason: Merged-In I8d3b8ac80ffdbe293221150f7272f7def80fc1c4 with SHA-1 3200f4216b is already in history

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

Change-Id: I4876c1ec5d62e7747725089c087e56b34272116e
 2022-02-11 19:50:07 +00:00
Treehugger Robot
10de2694b0 [automerger skipped] Merge "Fix the empty selection issue when onCreateActionMode returns false" am: 78abed41f6 am: e683159299 am: df9207247d -s ours 
am skip reason: Merged-In I793f76a23978cbbbbde2d16e8a522615174bcdd5 with SHA-1 11bd644822 is already in history

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

Change-Id: Ia5ec8466b900c1fb1085768007156695259ac2a0
 2022-02-11 19:48:49 +00:00
TreeHugger Robot
278a215ae2 Merge "Fix crash when overflow is selected and last bubble is removed" 2022-02-11 19:48:38 +00:00
TreeHugger Robot
4af785c198 [automerger skipped] Merge "Changes PM so apps are not installed for pre-created users." into sc-v2-dev am: 8d497c94c2 -s ours am: 471c8e00d1 -s ours 
am skip reason: Merged-In If261163c024fbdf4121fbcd0971ed784018a2991 with SHA-1 c6e6c51902 is already in history

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

Change-Id: Ie7047db4a5fd429afafb7df16923f0be17753870
 2022-02-11 19:48:07 +00:00
Maciej Żenczykowski
ee83bd3acc Merge "remove libbpf_android from libandroid_runtime" am: 26712e3c89 am: 8b6bb2039a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1981286

Change-Id: I475d9cb04bfc6ddb5c59317c8ca045b9561086c6
 2022-02-11 19:43:49 +00:00
Treehugger Robot
df9207247d Merge "Fix the empty selection issue when onCreateActionMode returns false" am: 78abed41f6 am: e683159299 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1980526

Change-Id: I1d3b74394b5a8b1bbe3bca1ad0b5b922c4dfcd74
 2022-02-11 19:43:14 +00:00
TreeHugger Robot
471c8e00d1 [automerger skipped] Merge "Changes PM so apps are not installed for pre-created users." into sc-v2-dev am: 8d497c94c2 -s ours 
am skip reason: Merged-In If261163c024fbdf4121fbcd0971ed784018a2991 with SHA-1 c6e6c51902 is already in history

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

Change-Id: I37588d3ab5195e5bfafcb007154cef5f61319eff
 2022-02-11 19:42:12 +00:00
TreeHugger Robot
8ff98c81c6 [automerger skipped] Merge changes from topic "presubmit-am-0704ae76e35641e1b208bbb25fb6f696" into sc-v2-dev-plus-aosp am: cede6de989 -s ours 
am skip reason: Merged-In If261163c024fbdf4121fbcd0971ed784018a2991 with SHA-1 70fd00bf2f is already in history

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

Change-Id: I8b32fb72ea9b34403e22c4f35d96e36651273278
 2022-02-11 19:41:45 +00:00
Maciej Żenczykowski
8b6bb2039a Merge "remove libbpf_android from libandroid_runtime" am: 26712e3c89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1981286

Change-Id: I5c911132eabc665120e7b25d702ca007dc46e6f1
 2022-02-11 19:26:13 +00:00
Treehugger Robot
e683159299 Merge "Fix the empty selection issue when onCreateActionMode returns false" am: 78abed41f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1980526

Change-Id: I95d9fac032b7503d7f9401405bffdfcb50af3a3c
 2022-02-11 19:25:25 +00:00
TreeHugger Robot
8d497c94c2 Merge "Changes PM so apps are not installed for pre-created users." into sc-v2-dev 2022-02-11 19:24:22 +00:00