Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,479 Commits 3 Branches 0 Tags
33a8ba28dfb47cd605c192547d2cb334e61e89cd
Commit Graph

813479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sally Qi
6964ec7ba2 Merge "Update OverlayProperties file's OWNER" 2023-01-19 01:06:36 +00:00
Treehugger Robot
91e9d9cd1c Merge "Update OWNERS file" am: 0b82c863c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389987

Change-Id: I850e9086bb92e66e7ed6c853024929f42f01eb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-19 00:26:27 +00:00
Treehugger Robot
0b82c863c8 Merge "Update OWNERS file" 2023-01-18 23:50:01 +00:00
Sally Qi
648f27d653 Update OverlayProperties file's OWNER 
Change-Id: Ide02d0bf67d35ed37f7ec9ad6fa225dbcbf26d95
 2023-01-18 22:54:53 +00:00
Treehugger Robot
86eb2a4411 Merge "Add NFC TagIntentAppPreference System API" am: ab5d84cf41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2337344

Change-Id: I5d79ad211ce3b26ee91bff699fadf9b9268f05a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 22:33:04 +00:00
Treehugger Robot
ab5d84cf41 Merge "Add NFC TagIntentAppPreference System API" 2023-01-18 22:08:06 +00:00
Edward Liaw
ffba92fe03 TEST_MAPPING: Add incremental install tests to kernel-presubmit 
Bug: 258819618
Test: atest :kernel-presubmit
Change-Id: Ie887d7f11c2da982e224eb55ef61dfb95a23b438
Signed-off-by: Edward Liaw <edliaw@google.com>
 2023-01-18 20:54:31 +00:00
Treehugger Robot
4bb59e2c5c Merge "Fix potential NPE when MessagingMessage's message is null" am: 49d070c4e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234268

Change-Id: I14373b7f3496c588b96e1bb9af9d19f202b9770d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 15:44:57 +00:00
Oli Lan
cf200064fe Merge changes from topic "lockdownvpnmainuser" am: 30eb737996 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378890

Change-Id: I3fcfb032e6d7e219a77e4739f90dfb7528917583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 15:44:05 +00:00
Oli Lan
cc920b547c Add UserManagerInternal method to get the main user id. am: 051f571479 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378889

Change-Id: Iae56d74c01a1b65744b592c73b1009d6e1ae8802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 15:43:54 +00:00
Julia Reynolds
ffa3b1c83c Merge "Fix crash when comparing messages" am: 42a3c415d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234087

Change-Id: I4a1c12260f76ae843cbc9c8519bf8ab1c41bc992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 15:39:57 +00:00
Treehugger Robot
49d070c4e5 Merge "Fix potential NPE when MessagingMessage's message is null" 2023-01-18 15:39:02 +00:00
Oli Lan
30eb737996 Merge changes from topic "lockdownvpnmainuser" 
* changes:
  Make lockdown VPN work for the main user.
  Add UserManagerInternal method to get the main user id.
 2023-01-18 15:32:14 +00:00
Julia Reynolds
42a3c415d7 Merge "Fix crash when comparing messages" 2023-01-18 15:23:35 +00:00
Piotr Fusik
b5a4e77ffc Fix "form/from" typos in comments 
Change-Id: I107083a92e9f5f0bdb8977a5d770c1d94a22479d
Signed-off-by: Piotr Fusik <piotr.fusik@gmail.com>
 2023-01-18 11:51:47 +01:00
George Chang
ba43e33ca5 Add NFC TagIntentAppPreference System API 
Add System APIs for setting a preference list by filtering package names
before sending NFC TAG intents.

ACTION_NDEF_DISCOVERED, ACTION_TECH_DISCOVERED and ACTION_TAG_DISCOVERED
will not be dispatched to an Activity if its package is disallowed.

An app is added to the preference list with the allowed flag set to true
when a Tag intent is dispatched to the package for the first time.
The System APIs are called by settings to note that the user wants to
change this default preference.

Bug: 244272155
Test: atest NfcFeatureFlagTest
Test: atest android.permission.cts.NfcPermissionTest
Merged-In: I9d353cf794dbe7dbcbfeb3a8b37ef29fe86387f1
Change-Id: I9d353cf794dbe7dbcbfeb3a8b37ef29fe86387f1
 2023-01-18 05:02:49 +00:00
Felipe Leme
36d7324524 Merge "(Partially) added myself to general mockingservicestests OWNERS." am: e97ad39eb7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2295649

Change-Id: I732ab2c8473b20179e8830b8fd25c080920dc67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-18 01:17:25 +00:00
Felipe Leme
e97ad39eb7 Merge "(Partially) added myself to general mockingservicestests OWNERS." 2023-01-18 00:42:58 +00:00
Alisher Alikhodjaev
06b732607c Update OWNERS file 
Test: none
Change-Id: I9c8527fa2f4e215349924340c0b3a4144d8fbccb
 2023-01-17 15:53:41 -08:00
Yixiao Luo
f2c597df89 Add API to register AttributionSource of TV App to TIS 
test: mmm
bug: 183922416
Change-Id: Ie537e5ce61bda84ba40d4a60aa4de45217f32aa5
 2023-01-17 12:20:36 -08:00
Android Build Coastguard Worker
fd6c648b09 Merge cherrypicks of ['ag/20961401'] into tm-qpr2-release. 
Change-Id: Iad419a04b3c6bdba832006413e8503473b3b6054
 2023-01-17 20:20:35 +00:00
Caitlin Shkuratov
d2b4515086 [Status Bar] Append "__external" to external icons. 
Bug: 255428281
Bug: 265307726
Test: manual: (1) Be in silent mode. (2) Make a phone call. (3) Mute the
phone call. -> Verify that *both* silent *and* mute icons appear in the
status bar. Verify that they can each be toggled independently without
affecting each other.
Test: atest StatusBarIconControllerImplTest (verified that all added
tests would have failed without the changes in this CL)

Change-Id: I54cebf7b9b96c1b333f1f2a9ca3d427e9e765790
(cherry picked from commit afd1fc252b)
Merged-In: I54cebf7b9b96c1b333f1f2a9ca3d427e9e765790
 2023-01-17 20:08:45 +00:00
Oli Lan
f7d2d091dc Make lockdown VPN work for the main user. 
This changes lockdown VPN to support the main user, rather than just the
system user.

Bug: 259515323
Test: atest VpnManagerServiceTest
Change-Id: I3468d14d92f1e8c66e3188b4a5a00e98bce18dac
 2023-01-17 17:52:09 +00:00
Oli Lan
051f571479 Add UserManagerInternal method to get the main user id. 
This adds a method to get the id of the main user on the device.

Currently this always returns the id of the system user.

Bug: 256624031
Test: atest VpnManagerServiceTest (with topic)
Merged-In: Ib36f3b372f9bf33cbb097c4af63eb43515ac835b
Change-Id: I4aa0feb68083460c6aef917337e8bfc09a6788d4
 2023-01-17 17:51:34 +00:00
Treehugger Robot
d3568b3e1b Merge "Add OWNERS for quickaccesswallet" am: 486bbbd398 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2391532

Change-Id: I55ea5e69f7cfef94867aebda27b29124c7d12ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-17 16:55:21 +00:00
Treehugger Robot
486bbbd398 Merge "Add OWNERS for quickaccesswallet" 2023-01-17 16:20:47 +00:00
Matt Casey
68296b507c Merge "Change *EmptyStateProvider.java OWNERS" am: d2759a4ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389712

Change-Id: I3f7901e87dc87bf01d6559fa1d4f0f7bae932fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-17 15:33:29 +00:00
Matt Casey
d2759a4ce6 Merge "Change *EmptyStateProvider.java OWNERS" 2023-01-17 14:59:41 +00:00
Julia Reynolds
02cfcabdd1 Add OWNERS for quickaccesswallet 
Change-Id: Ic065c002ec02a50cd3e35e1fcdfdbcf1a40b6fc2
 2023-01-17 14:42:21 +00:00
Aaron Huang
89dfc37159 Merge "Remove dev recorder information from event log" am: ab810ba161 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183581

Change-Id: Ic9f5dfe197bf2066e407189f25b681354bf81968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-17 07:48:18 +00:00
Aaron Huang
ab810ba161 Merge "Remove dev recorder information from event log" 2023-01-17 07:27:34 +00:00
Jing Ji
5b474f61a2 Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" am: 2d361f6350 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2318269

Change-Id: I0dc34f6830cf6196bea420bbc3e0e6d3eedf75fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-17 03:21:20 +00:00
Jing Ji
2d361f6350 Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" 2023-01-17 02:46:16 +00:00
Trevor Black
46de3c9ee7 Merge changes from topic "revert-2382753-revert-2208281-opengl-matrix-VRTQUTHPDK-IGVJUILFUF" am: 0a84b51762 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2387012

Change-Id: I5d42fd39952e1e29cf66255eea956bc6f7645b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 19:18:07 +00:00
Trevor Black
4c2298419c Revert "Revert "Move Matrix operations multiplyMM and MultiplMV ..." am: 449f4269e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2387013

Change-Id: Id93cf4212a104a39ceca24a0886216b60bda6dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 19:17:37 +00:00
Trevor Black
0a84b51762 Merge changes from topic "revert-2382753-revert-2208281-opengl-matrix-VRTQUTHPDK-IGVJUILFUF" 
* changes:
  Revert "Revert "Deprecate setRotateEulerM and replace with setRo..."
  Revert "Revert "Move Matrix operations multiplyMM and MultiplMV ..."
 2023-01-14 18:34:01 +00:00
Jean Chalard
9812452186 Merge "Implement an API to block non-enterprise networks" am: 8c2897844b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2382000

Change-Id: I2e5e7d0790e5a1fac71fead37409495ebb26a5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 11:02:20 +00:00
Jean Chalard
8c2897844b Merge "Implement an API to block non-enterprise networks" 2023-01-14 10:28:01 +00:00
Treehugger Robot
337b599bd5 Merge "Correct path to files in core/res/OWNERS" am: 027bd24481 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389312

Change-Id: Ib7659d880ec7ff5ad3c1df996e52c0858304384f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 23:11:51 +00:00
Matt Casey
17cc7745d8 Change *EmptyStateProvider.java OWNERS 
Part of sharesheet.

Change-Id: I5edd95d094e5f993420b08c0297c894c14087d5d
 2023-01-13 23:00:35 +00:00
Treehugger Robot
027bd24481 Merge "Correct path to files in core/res/OWNERS" 2023-01-13 22:31:41 +00:00
Trevor Black
16ed37a876 Revert "Revert "Deprecate setRotateEulerM and replace with setRo..." 
Revert submission 2382753-revert-2208281-opengl-matrix-VRTQUTHPDK

Reason for revert: Revert-Revert-with-fix

Reverted changes: /q/submissionid:2382753-revert-2208281-opengl-matrix-VRTQUTHPDK

Change-Id: Ie6b4eee4f06c1b8b6b8e97bdbce76d01e05f15d1
 2023-01-13 19:57:59 +00:00
Mariia Sandrikova
8f50322a04 Correct path to files in core/res/OWNERS 
Bug: 262439469
Change-Id: Ida7cf2aadd190fcd582943801167eed4c535cadb
Test: manual
 2023-01-13 18:56:10 +00:00
Martynas Petuška
d281947294 Merge "Provisioning team setup" am: 123221ff83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2384455

Change-Id: I70baad38d7f344670e60fe038addb3297cfd6b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 15:45:04 +00:00
Paul Duffin
8076a6a0d3 Merge "Conditionally add the car bcpf to platform bootclasspath" am: 18f0a04eb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378892

Change-Id: If730f49da9b288ffc042a6132297c2d7a8628950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 15:43:33 +00:00
Martynas Petuška
123221ff83 Merge "Provisioning team setup" 2023-01-13 15:18:29 +00:00
Paul Duffin
18f0a04eb8 Merge "Conditionally add the car bcpf to platform bootclasspath" 2023-01-13 15:07:50 +00:00
Julia Reynolds
f32d46c8e0 Merge "Add missing nullness annotations to Notification.Action and its Builder." am: 7a75dfd56d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383854

Change-Id: I4581b4bd9365d10701a619fa17783fffb126cb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 14:26:34 +00:00
Julia Reynolds
7a75dfd56d Merge "Add missing nullness annotations to Notification.Action and its Builder." 2023-01-13 14:00:10 +00:00
Martynas Petuška
63ac232dec Provisioning team setup 
Test: N/A
Bug: N/A
Change-Id: I4d87e54a0de35cb5c9031fd4fad1ec197cf0b8a4
 2023-01-13 13:06:55 +00:00