Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,892 Commits 3 Branches 0 Tags
ea1b5d878c4dc8980e1fccac67d9745beff55643
Commit Graph

638892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ea1b5d878c Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev 2021-04-29 21:51:18 +00:00
TreeHugger Robot
1461322b42 Merge "Re-enable AppOpsServiceTest#testShutdown" into sc-dev 2021-04-29 21:50:28 +00:00
Tracy Zhou
133e340e1d Merge "Add onSwipeToHomeFinished to OverviewProxyListener" into sc-dev 2021-04-29 21:43:19 +00:00
Martin Brabham
329a11f7c6 Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 am: 50e294ad9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb
 2021-04-29 21:33:10 +00:00
Martin Brabham
d50c8e0703 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7 am: 2d3dbcab8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: Ia4d99bf5f2dcee3d688796dfa3e11c1d104132a1
 2021-04-29 21:32:57 +00:00
TreeHugger Robot
22fba34bba Merge "Grant CONTROL_CAR_POWER_POLICY permission to car shell" into sc-dev 2021-04-29 21:32:46 +00:00
Peter Collingbourne
a3b1c2e028 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 am: 43ce684e3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I9472707d7d680ad63794ed4b61ecd1e4506ae5c5
 2021-04-29 21:32:03 +00:00
Jack Nudelman
71a0c99113 [automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58 am: 611a55f03d -s ours 
am skip reason: Merged-In I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e with SHA-1 2cdad9f0a2 is already in history

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

Change-Id: If8adee8736161618173cc16f3c7d611beaafeca7
 2021-04-29 21:30:28 +00:00
Grace Jia
acdaa7e8d8 [automerger skipped] Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e am: 5585bdb0ec -s ours 
am skip reason: Merged-In I86f88d68c8629a0329dcde7b2d17928cacec37e7 with SHA-1 b53cb66e5f is already in history

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

Change-Id: I1dda8c96b0356db74ae93b90029e9a9062145d8d
 2021-04-29 21:30:07 +00:00
Jing Ji
be5425c6fd Merge "Add state BOUND_FGS_OR_TOP and FGS into ProcessState Enum in ProcStats" into sc-dev 2021-04-29 21:23:11 +00:00
Martin Brabham
50e294ad9b Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
 2021-04-29 21:10:28 +00:00
Martin Brabham
2d3dbcab8f OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I98f507b1e35126406ae5f768a346afa8e4dd22d5
 2021-04-29 21:10:21 +00:00
Peter Collingbourne
43ce684e3b Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: Ia06cfe69ef224be2cbe3abf32df3f83622481861
 2021-04-29 21:09:27 +00:00
Jack Nudelman
611a55f03d Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: I30f132276181affdc448995ab7b93900b6f22512
 2021-04-29 21:08:28 +00:00
Grace Jia
5585bdb0ec Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: Ic98c8b07df96a19472176a65109aff99cd9704a2
 2021-04-29 21:08:24 +00:00
Martin Brabham
8411b5d7b3 Merge changes from topic "bluetooth_oob_api" am: 2e67798711 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I5c7de78ec2e77a617daf90cdc45052865d03a037
 2021-04-29 20:56:21 +00:00
Martin Brabham
e897917de7 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I36420ea92322b00a6b55a4b4c5bbd759cc7ee263
 2021-04-29 20:53:58 +00:00
Jing Ji
72eee56f06 Merge "Support aggregation over association sources per process" into sc-dev 2021-04-29 20:46:50 +00:00
Peter Collingbourne
b16d968e54 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I778cc45627af85a3b7bc5a140540302772638c1d
 2021-04-29 20:46:46 +00:00
Jack Nudelman
296cec5c58 Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d
 2021-04-29 20:43:24 +00:00
Grace Jia
f018ea3c3e Add D2D sharing level setting APIs. am: d5eb6fb0ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: I5b17ef39ba935914c9e63a363c972d00ac664d0a
 2021-04-29 20:42:32 +00:00
Lucas Dupin
fd734e66d7 Merge "Remove legacy QS background" into sc-dev 2021-04-29 20:36:15 +00:00
Julia Reynolds
75fd8835fa [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours am: 9b873fe85e -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 d61aae299c is already in history

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

Change-Id: I2b87f72765fe3f968bcdede0d346313d68c3cfd6
 2021-04-29 20:06:29 +00:00
Jay Sullivan
a26bf49927 Merge "Make REVOKE_WHEN_REQUESTED a SystemApi field" into sc-dev 2021-04-29 19:52:33 +00:00
Julia Reynolds
267965a8fc [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: 3ec2ca42fc -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I7e2e2401a00eff36334b2961627f9a40e84d45a3
 2021-04-29 19:48:09 +00:00
Julia Reynolds
9b873fe85e [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: Ibda9eec07625c1c002ea16bf9f1b79234e56eab7
 2021-04-29 19:47:18 +00:00
Alexander Dorokhine
1ddbd46377 Merge "Remove AndroidFuture from AppSearch." into sc-dev 2021-04-29 19:43:17 +00:00
Evan Severson
4a225373ec Merge "Fix incorrect index usage in SensorPrivacyService init" into sc-dev 2021-04-29 19:40:01 +00:00
TreeHugger Robot
9936b8cbf1 Merge "Expose test APIs on ContentInfo and add CTS coverage" into sc-dev 2021-04-29 19:36:11 +00:00
Lyn Han
41a4d6741e Merge "Scroll notifications fullscreen" into sc-dev 2021-04-29 19:06:11 +00:00
TreeHugger Robot
ec726a4a1d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-29 18:54:25 +00:00
Martin Brabham
2e67798711 Merge changes from topic "bluetooth_oob_api" 
* changes:
  Convert onOobData parameter for OobData from @Nullable to @NonNull
  OOB: Remove static creator methods in favor of public constructors
 2021-04-29 18:51:28 +00:00
Julia Reynolds
3ec2ca42fc [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I7e14b2b22acc628e1ee8097593fef7488a7ba231
 2021-04-29 18:45:01 +00:00
Peter Collingbourne
e0561210b2 Merge "Fix two problems in the ExecuteBinary function." 2021-04-29 18:44:44 +00:00
Fabian Kozynski
597863496b Merge "Brightness slider animation, expand" into sc-dev 2021-04-29 18:43:39 +00:00
Julia Reynolds
f70b22f3be [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I833e5f4c72d25055df6ade76eb209405834c9e27
 2021-04-29 18:43:29 +00:00
TreeHugger Robot
8e922b57f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-29 18:34:49 +00:00
Jack Nudelman
f99f7fce5d Merge changes from topics "VOIMS_OPT_IN", "d2d" 
* changes:
  Add new provisioning flag for VOIMS opt-in
  Add D2D sharing level setting APIs.
 2021-04-29 18:31:39 +00:00
Nazanin Bakhshi
65acc588ee Merge "Revert "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED"" into sc-dev 2021-04-29 18:31:13 +00:00
Julia Reynolds
f08bd224bb [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I38139a95761f70ad6a523888cdda2076ce65aa30
 2021-04-29 18:28:02 +00:00
TreeHugger Robot
86fb403551 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-29 18:26:55 +00:00
Nazanin Bakhshi
95807e9a98 Revert "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" 
Revert "Using PHYSICAL_CHANNEL_CONFIG to detect RRC state"

Revert submission 14254545-PPC_detect_RRC_state

Reason for revert: <crashing Phone app b/186763089>
Reverted Changes:
Idf8f8b419:Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORT...
I65f392084:Using PHYSICAL_CHANNEL_CONFIG to detect RRC state

Change-Id: I46ed100d2f0b081587181a4cef29c38f76caaf2d
 2021-04-29 18:16:11 +00:00
Daniel Santiago Rivera
b14134faf2 Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe am: 1cfbf3a69e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I15046e16677d49b795b8e845fd082c80c7d1cea7
 2021-04-29 18:14:31 +00:00
TreeHugger Robot
e548cadbc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours am: a18e01b554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40d8cf0e1d6a30f34d4e4c0c1553e2c52a5b1bb5
 2021-04-29 18:13:57 +00:00
TreeHugger Robot
6f8488d44a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours am: 805d5813ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief9d87de9e3c97734491a89d8c60a177cfd23c5b
 2021-04-29 18:13:17 +00:00
Julia Reynolds
80b1e85c12 [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I26564121399185079e7dccd619971d57c21249bc
 2021-04-29 18:11:46 +00:00
Daniel Santiago Rivera
1cfbf3a69e Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I9ae5f4063db356c4bf70782db3492635e83daee4
 2021-04-29 18:11:41 +00:00
Curtis Belmonte
c05b6dbe20 Merge "Send AIDL face enrollment frame info to clients" into sc-dev 2021-04-29 17:58:28 +00:00
Bill Yi
641437329b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e346b367f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iede02600fb4c5e127896405c5946734415676688
 2021-04-29 17:55:46 +00:00
Chris Li
f9c4ee1fd3 Merge "Move legacy split screen flicker tests for non-resizable to presubmit" into sc-dev 2021-04-29 17:49:15 +00:00