Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
630,754 Commits 3 Branches 0 Tags
c243f46c6fcf87cdabe9ecf3462aa2c3f0960836
Commit Graph

630754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
c243f46c6f Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev 2021-03-19 20:27:43 +00:00
Branden Archer
30491b1daf Merge "Allow PO to enable security logging on work profile" into sc-dev 2021-03-19 20:24:30 +00:00
Shuzhen Wang
71ca7dff7e Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I16a4e5430872102f2650845d29f4a7ee7a4c7580
 2021-03-19 20:20:07 +00:00
TreeHugger Robot
452d2916b9 Merge "Limit primary text color to notification shelf icons" into sc-dev 2021-03-19 20:15:02 +00:00
Jordan Liu
1dfc25617a Make backport_s_notif_rules readable 
Bug: 182313963
Test: atest
Change-Id: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
(cherry picked from commit a5792f7402)
Merged-In: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
 2021-03-19 19:52:00 +00:00
Nate Myren
c3d290dcec Merge "Clarify AudioRecord.Builder.setContext documentation" into sc-dev 2021-03-19 19:42:31 +00:00
TreeHugger Robot
c8593c879e Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev 2021-03-19 19:41:18 +00:00
Shuzhen Wang
7b8379f55d Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f
 2021-03-19 19:35:38 +00:00
Ying Xu
5a34763729 Merge "Use different slots for no_calling and call_strength icons" into sc-dev 2021-03-19 19:06:41 +00:00
Christine Franks
5590c983c1 Merge "Fix order of params in color display help doc" into sc-dev 2021-03-19 19:06:25 +00:00
Julia Reynolds
e363bcdbfa Merge "Be more specific about media statuses" into sc-dev 2021-03-19 19:01:23 +00:00
Shuzhen Wang
f1f504042a Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6
 2021-03-19 18:58:14 +00:00
Yan Wang
47067afdd2 Merge "Remove the reading of APK file." am: 08d5380762 am: 4f17d64ff8 am: f8fad064c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: I1a4d1f7dfac18af3dc92265c9076e0bafad145f1
 2021-03-19 18:45:00 +00:00
Treehugger Robot
c4ba925293 Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 3df03a83af am: f8583062fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: I6b1aa628a1c48c4c7ed02a4d379cab2316b13526
 2021-03-19 18:44:03 +00:00
TreeHugger Robot
3a910e42c5 Merge "Grant additional quota to installers." into sc-dev 2021-03-19 18:40:32 +00:00
Shuzhen Wang
171249e857 Merge "Camera: Fix a removal-while-iterate bug" 2021-03-19 18:34:00 +00:00
TreeHugger Robot
2cea467f9b Merge "Fix a timing issue in unlock signal propagation in AppSearch" into sc-dev 2021-03-19 18:20:06 +00:00
TreeHugger Robot
06d70ab66d Merge "Allow the system to specify user-force when restricting." into sc-dev 2021-03-19 18:19:37 +00:00
Yan Wang
f8fad064c1 Merge "Remove the reading of APK file." am: 08d5380762 am: 4f17d64ff8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Id5e54de124e2fa475e93281855d4af2d7a90255b
 2021-03-19 18:01:55 +00:00
Treehugger Robot
f8583062fd Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 3df03a83af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: Ib33b1d69e8480ba1ee2193671a88ed91d624d4bc
 2021-03-19 18:01:07 +00:00
Lee Shombert
758971d274 Merge "Cleanup PM snapshot" into sc-dev 2021-03-19 17:51:11 +00:00
Caitlin Cassidy
aeee47918a Merge "Convert SystemActions to Dagger." into sc-dev 2021-03-19 17:50:24 +00:00
TreeHugger Robot
c3acebab45 Merge "Add eventMask to DM.registerDisplayListener" into sc-dev 2021-03-19 17:39:54 +00:00
Ady Abraham
97190e25e9 Merge changes from topic "eEarlyWakeup_remove" into sc-dev 
* changes:
  rename ExplicitEarlyWakeup -> EarlyWakeup
  Remove ISurfaceComposer::eEarlyWakeup
 2021-03-19 17:39:19 +00:00
TreeHugger Robot
15f8f2c5a0 Merge "Update DisabledUdpfsController logic" into sc-dev 2021-03-19 17:36:42 +00:00
TreeHugger Robot
3abfcd5945 Merge "OMS: Assert which packages are updated" into sc-dev 2021-03-19 17:35:31 +00:00
Yan Wang
4f17d64ff8 Merge "Remove the reading of APK file." am: 08d5380762 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Ie918cc22711f4ccc03e0619868f303e4be0d25d1
 2021-03-19 17:27:58 +00:00
Automerger Merge Worker
f773a1e4cc Merge "[automerger skipped] Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 am: 1941a16671 -s ours am: 3e0307160c -s ours" into sc-dev 2021-03-19 17:26:27 +00:00
Kevin Chyn
2fc40ea719 Merge "Add BiometricPrompt.Builder#setAllowBackgroundAuthentication TestApi" into sc-dev 2021-03-19 17:26:18 +00:00
Treehugger Robot
27b169b6f4 [automerger skipped] Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 am: 1941a16671 -s ours am: 3e0307160c -s ours 
am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 8b15af2a92 is already in history

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

Change-Id: I8395e5a9a7d5a091eb3b6026b26910ee06afe82a
 2021-03-19 17:26:00 +00:00
Treehugger Robot
3df03a83af Merge "Fix InetAddressCompat exception handling" am: cd37173df6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: I1d65d6b011e5ce585835e1c9df9eea0afb74b0f4
 2021-03-19 17:21:29 +00:00
Sally Yuen
f463575980 Merge "Reduce Bright Colors feature name update" into sc-dev 2021-03-19 17:18:26 +00:00
TreeHugger Robot
f686e22934 Merge "[NS03] Mix in other CS-managed properties" into sc-dev 2021-03-19 17:07:21 +00:00
Quang Luong
406c9fb61c Merge "Revert "Update min_sdk_versions to match WifiTrackerLib"" into sc-dev 2021-03-19 17:04:58 +00:00
Treehugger Robot
3e0307160c [automerger skipped] Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 am: 1941a16671 -s ours 
am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 8b15af2a92 is already in history

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

Change-Id: I09e8f46dca7f65c032c9852300db3d3c96f4a335
 2021-03-19 17:03:10 +00:00
Yan Wang
08d5380762 Merge "Remove the reading of APK file." 2021-03-19 16:55:54 +00:00
Quang Luong
0c3b94e971 Revert "Update min_sdk_versions to match WifiTrackerLib" 
Revert "Update GoogleWifiTrackerLib min_sdk_version to match Wif..."

Revert "[WifiTrackerLib] Put @hide methods in separate wrapper p..."

Revert "Update TwoPanelSettingsLib min_sdk_version to match Sett..."

Revert "Update BluetoothServices min_sdk_version to match Settin..."

Revert "Update DroidTwoPanelSettingsLib min_sdk_version to match..."

Revert submission 13842044-wifitrackerlib-hideapi

Reason for revert: build breakage
Reverted Changes:
I85b8ed34a:[WifiTrackerLib] Put @hide methods in separate wra...
I891f51aab:Update DroidTwoPanelSettingsLib min_sdk_version to...
If8e82e047:Update GoogleWifiTrackerLib min_sdk_version to mat...
I4529627fb:Update BluetoothServices min_sdk_version to match ...
I87b46a09b:Update TwoPanelSettingsLib min_sdk_version to matc...
I65a3246b4:Update min_sdk_versions to match WifiTrackerLib

Change-Id: I083b764b42e5cf5476b1ec9ed3a9b2d5ed12afc9
 2021-03-19 16:55:23 +00:00
TreeHugger Robot
2af4244cf4 Merge "Use module resources in NetworkNotificationManager." into sc-dev 2021-03-19 16:54:49 +00:00
Pinyao Ting
46e734cae9 Fix a timing issue in unlock signal propagation in AppSearch 
There is a tiny gap between user unlock and when the unlock event
reaches AppSearch. The fact that unlock event haven't reach AppSearch
isn't suffice to say user is not unlocked. This CL added the logic to
check with UM when cache misses.

Bug: 151359749
Test: manual
Change-Id: I49f0754d53fc4d391245917bb35b726a305e4e30
 2021-03-19 09:49:47 -07:00
Chong Zhang
00967754c3 Grant permission to shell for ResourceObserverNativeTest 
bug: 178811728
bug: 182845274
test: atest ResourceObserverNativeTest
Change-Id: I60e745c4ff32cbf8f8ff8b5d016555a25a065f39
 2021-03-19 09:45:35 -07:00
Kweku Adams
0c511f9999 Grant additional quota to installers. 
Give apps with the INSTALL_PACKAGES permission granted an additional 30
minutes of EJ quota.

Bug: 158150494
Bug: 171305774
Test: atest CtsJobSchedulerTestCases
Test: atest FrameworksMockingServicesTests:QuotaControllerTest
Change-Id: I53ac03553e7df8b15ce1770110523da39ee6c867
 2021-03-19 09:43:52 -07:00
Christopher Tate
529052350f DO NOT MERGE - Disallow deletion of channels with FGS notifications 
Bug: 156090809
Test: atest CtsAppTestCases:NotificationManagerTest
Test: atest CtsAppTestCases:android.app.cts.ServiceTest
Change-Id: I1c2bb78d86f194585d273661cecf3419f51965df
Merged-In: I1c2bb78d86f194585d273661cecf3419f51965df
(cherry picked from commit 39b3890268913bc2dc8b90671d042c0e9b4090d2)
 2021-03-19 16:43:32 +00:00
Treehugger Robot
cd37173df6 Merge "Fix InetAddressCompat exception handling" 2021-03-19 16:38:54 +00:00
Treehugger Robot
1941a16671 Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640622

Change-Id: I89221d632a20d176b2aa358ce7b7a3749c85661d
 2021-03-19 16:25:27 +00:00
Quang Luong
45abbc309d Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev 2021-03-19 16:19:15 +00:00
TreeHugger Robot
6ed6e6e18e Merge "Fix InetAddressCompat exception handling" into sc-dev 2021-03-19 16:14:10 +00:00
Hangyu Kuang
088ba1636e Merge "transcoding: Address API council comments Part2" into sc-dev 2021-03-19 16:08:59 +00:00
Treehugger Robot
a5e337b0b3 Merge "Keystore 2.0: Enable by default." 2021-03-19 16:06:00 +00:00
Ricky Wai
5b7bdf95bc Merge "Revert "Change mounting storage data and obb to on by default"" into sc-dev 2021-03-19 16:03:54 +00:00
TreeHugger Robot
21ca6a91a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-19 15:49:48 +00:00