Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,290 Commits 3 Branches 0 Tags
fa32bfbadf428e969ca99b4ccb2ae105b2c866ec
Commit Graph

761290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beverly Tai
fa32bfbadf Merge "Update scaled padding for all devices" into tm-dev am: 56e26a9e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320872

Change-Id: Id61747fd70a8a82de174a72ca52904e2f8dc56ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 13:32:01 +00:00
Beverly Tai
56e26a9e4d Merge "Update scaled padding for all devices" into tm-dev 2022-05-12 12:58:44 +00:00
Martijn Coenen
5e347ed6a3 Merge "Add in sandbox UIDs when configuring VPN." am: 1cdbdd902d am: 3396afc69f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073688

Change-Id: Iebcec9c693af390f1cc8167c6b252389a19ccb28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:43:13 +00:00
Matt Pietal
0f11188896 Merge "SIM - Resume view controller" into tm-dev am: 0063880229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321153

Change-Id: I4da63d89d344d1663bd6ec40ae3b5aa3c29e5dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:39:25 +00:00
Matt Pietal
0063880229 Merge "SIM - Resume view controller" into tm-dev 2022-05-12 12:32:31 +00:00
TreeHugger Robot
6a53ef5689 Merge "Cancel animating the divider bar after it being released" into tm-dev am: 9878319331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18319509

Change-Id: Ic1e086e5cd37c1b983ffa08c31832b92215599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:27:52 +00:00
Matt Casey
03a4bc053d Merge "Load app icon in miniresolver." into tm-dev am: 8cdbd6c00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321625

Change-Id: I8802084bf5761806c30c484629a429cf9284c159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:27:24 +00:00
Julia Reynolds
4e886df594 Merge "Fix blockable system notifications" into tm-dev am: ddfeaa18f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18292722

Change-Id: I385a699e3d7e377d9ccb8b3c09b106df3167449b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:26:54 +00:00
Kholoud Mohamed
959d07bcf4 Merge "Add missing enterprise updatable strings in SysUI" into tm-dev am: e563a237aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18230547

Change-Id: I6edd3d9a0d562ababb9c9f66083f3765c3cdfc27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:26:26 +00:00
lucaslin
492d95323b [automerger skipped] Modify javadoc for some extra values of VpnManager event am: bf3953a627 -s ours 
am skip reason: Merged-In I7fd4b6dad1a4363336f03c217e635fc45bcd0ab6 with SHA-1 4b6b7987a1 is already in history

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

Change-Id: Ib6e25276457c4c3178c1e4470a21639c12143b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:26:17 +00:00
lucaslin
91a927f14a [automerger skipped] Add toString() for VpnProfileState am: 0eb8f090f6 -s ours 
am skip reason: Merged-In Ia36d794446114c0c2c27e725cba6a4dc1240ae38 with SHA-1 6a75e5a3c5 is already in history

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

Change-Id: Icafb284936289f91dff30a879464ecbb91bd58f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:26:04 +00:00
Lucas Lin
061d1ba315 [automerger skipped] Merge "Move mSessionKey into Ikev2VpnRunner and make it to be a final var" into tm-dev am: e7dad46f07 -s ours 
am skip reason: Merged-In If7eb7e0ec8ab42b17a5636aeced65385e7849b6a with SHA-1 1cb9f6181b is already in history

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

Change-Id: Icb23f2878a599bebcdef70e499e7d5bbba258052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:25:53 +00:00
lucaslin
b3129371f1 [automerger skipped] Move mSessionKey into Ikev2VpnRunner and make it to be a final var am: 700a52894c -s ours 
am skip reason: Merged-In If7eb7e0ec8ab42b17a5636aeced65385e7849b6a with SHA-1 1cb9f6181b is already in history

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

Change-Id: I3aca349d50fb117c1e3a1ea13da0a51db90ab94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:25:51 +00:00
Shaowei Shen
042b1184c1 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one" into tm-dev am: 23e31a1264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282395

Change-Id: Ibf0790d4f100cf36fd796febcb7ee3e61e6d4f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:25:04 +00:00
shaoweishen
df10e7bcaa DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one am: 60cdc0c439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282395

Change-Id: Ica7033fc03baa1045179c3b214216acd2646960c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:25:02 +00:00
Weng Su
bae2b69014 Merge "Restrict Hotspot tile in Quick Settings" into tm-dev am: f31b335eb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287506

Change-Id: Iecf4bda02744959ece88006e5e2828e1f081ec77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:23:37 +00:00
Martijn Coenen
3396afc69f Merge "Add in sandbox UIDs when configuring VPN." am: 1cdbdd902d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073688

Change-Id: Ideac20a8ec70ab7c9f97df9e8c74938bb89ca05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:20:34 +00:00
Sarah Chin
64bc150794 Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18214219

Change-Id: Ifbf84c4b2da833c7342d13199df12f9cff5ac92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:20:22 +00:00
Automerger Merge Worker
890f8e2a19 Merge "[automerger skipped] Merge "Fixed the incorrect APN dedupling" am: 25157d1128 am: d8a8bdbffa -s ours" into tm-dev-plus-aosp 2022-05-12 12:18:17 +00:00
Ruslan Tkhakokhov
3579acc6c7 Merge "Make BackupTransport more resilient" into tm-dev am: a3a657350a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321342

Change-Id: Ib74951af818537abca1bc9e576b2ccccfa8c173b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:17:47 +00:00
Treehugger Robot
37e6f62d98 [automerger skipped] Merge "Fixed the incorrect APN dedupling" am: 25157d1128 am: d8a8bdbffa -s ours 
am skip reason: Merged-In I02190be62855f5f3b86c41677bbf7ff6a362e652 with SHA-1 1d470caabb is already in history

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

Change-Id: Ibd6d343d5f80e56989762aaf4e4ae093ac5fa755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:17:40 +00:00
Automerger Merge Worker
88ae40687a Merge "Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92eb" into tm-dev-plus-aosp 2022-05-12 12:17:09 +00:00
Treehugger Robot
f57713a784 [automerger skipped] Merge "Added enhanced IWLAN handover check support" am: 0f603e1ffb am: 73292c7d8e -s ours 
am skip reason: Merged-In Iad41d4e8e23001b9c19a81edac04b1099e550f3e with SHA-1 72c2e8309b is already in history

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

Change-Id: Iaab371d3b98c7c4737a7e8d745743c8b6d3606cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:54 +00:00
Chris Li
812998e0d9 Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950644

Change-Id: I612180cacd685fd34c0f84564261d1a527b0edbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:48 +00:00
Treehugger Robot
d8a8bdbffa Merge "Fixed the incorrect APN dedupling" am: 25157d1128 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094528

Change-Id: I6414d3128c22f72c35f59b3ec4caf85098bf7e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:28 +00:00
TreeHugger Robot
922aaf5588 Merge "Keystore: Wire up Ed25519 signing" into tm-dev am: e41f27bfc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281070

Change-Id: I111435ffa772a1a3c27998020d8caa1db430a1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:15:13 +00:00
Martijn Coenen
1cdbdd902d Merge "Add in sandbox UIDs when configuring VPN." 2022-05-12 12:06:55 +00:00
TreeHugger Robot
9878319331 Merge "Cancel animating the divider bar after it being released" into tm-dev 2022-05-12 12:05:59 +00:00
Matt Casey
8cdbd6c00a Merge "Load app icon in miniresolver." into tm-dev 2022-05-12 12:04:57 +00:00
Julia Reynolds
ddfeaa18f7 Merge "Fix blockable system notifications" into tm-dev 2022-05-12 11:55:40 +00:00
Kholoud Mohamed
e563a237aa Merge "Add missing enterprise updatable strings in SysUI" into tm-dev 2022-05-12 11:44:21 +00:00
lucaslin
bf3953a627 Modify javadoc for some extra values of VpnManager event 
The underlying network, NetworkCapabilities and LinkProperties
are not necessary to send to VPN app since the purpose of
CATEGORY_EVENT_DEACTIVATED_BY_USER and
CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED are to notify VPN
app that VPN is deactivated by the user or VPN always-on
status is changed.

Bug: 191413541
Test: Javadoc only changes.
Change-Id: I7fd4b6dad1a4363336f03c217e635fc45bcd0ab6
(cherry picked from commit 4b6b7987a1)
Merged-In: I7fd4b6dad1a4363336f03c217e635fc45bcd0ab6
 2022-05-12 11:13:11 +00:00
lucaslin
0eb8f090f6 Add toString() for VpnProfileState 
Sample log:
{State: DISCONNECTED, SessionId: null, Always-on: false,
Lockdown: false}
{State: CONNECTED, SessionId: d7913298-c07f-49de-b84e-304b5e26da89,
Always-on: true, Lockdown: false}

Bug: 225010642
Test: Add a log in Vpn.java and print it.
Change-Id: Ia36d794446114c0c2c27e725cba6a4dc1240ae38
(cherry picked from commit 6a75e5a3c5)
Merged-In: Ia36d794446114c0c2c27e725cba6a4dc1240ae38
 2022-05-12 11:12:40 +00:00
Lucas Lin
e7dad46f07 Merge "Move mSessionKey into Ikev2VpnRunner and make it to be a final var" into tm-dev 2022-05-12 11:10:17 +00:00
Treehugger Robot
25157d1128 Merge "Fixed the incorrect APN dedupling" 2022-05-12 10:57:00 +00:00
Shaowei Shen
23e31a1264 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one" into tm-dev 2022-05-12 10:19:12 +00:00
Weng Su
f31b335eb2 Merge "Restrict Hotspot tile in Quick Settings" into tm-dev 2022-05-12 09:53:57 +00:00
Sarah Chin
dfada27e9f Merge "Update ServiceState broadcast for location permissions" into tm-dev 2022-05-12 09:20:04 +00:00
Ruslan Tkhakokhov
a3a657350a Merge "Make BackupTransport more resilient" into tm-dev 2022-05-12 09:11:13 +00:00
Chris Li
9b36cc92eb Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev 2022-05-12 09:02:49 +00:00
TreeHugger Robot
e41f27bfc8 Merge "Keystore: Wire up Ed25519 signing" into tm-dev 2022-05-12 08:49:58 +00:00
Treehugger Robot
73292c7d8e Merge "Added enhanced IWLAN handover check support" am: 0f603e1ffb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094527

Change-Id: I5f9319b03103ff90286a88c1fdc869189827c125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 08:45:39 +00:00
Treehugger Robot
0f603e1ffb Merge "Added enhanced IWLAN handover check support" 2022-05-12 08:35:35 +00:00
Mariia Sandrikova
f5fc70b4c4 Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9fbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281173

Change-Id: I7609dfc9d6cd5e05cf64d9df87820c734a8900c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 08:00:44 +00:00
Mariia Sandrikova
4b33be9fbd Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev 2022-05-12 07:27:55 +00:00
Jack Yu
f419d33c6a Fixed the incorrect APN dedupling 
Fixed that APN settings can't be merged when one APN
entry has MTU set, but the other doesn't. Also default
MTU unset value to 0 for backwards compatability.

Test: atest DataProfileManagerTest & Manual testing
Fix: 226563054
Change-Id: I02190be62855f5f3b86c41677bbf7ff6a362e652
Merged-In: I02190be62855f5f3b86c41677bbf7ff6a362e652
 2022-05-12 00:27:19 -07:00
Jack Yu
98b6e1174d Added enhanced IWLAN handover check support 
Added enhanced IWLAN handover check support, where telephony
frameworks will not perform handover if the target transport
is out of service, or VoPS not supported. The network will be
torn down on the source transport, and re-established on the
target transport when condition is allowed for bringing up a
new network.

Fix: 229151428
Test: atest DataNetworkControllerTest & Sanity testing
Change-Id: Iad41d4e8e23001b9c19a81edac04b1099e550f3e
Merged-In: Iad41d4e8e23001b9c19a81edac04b1099e550f3e
 2022-05-12 00:05:58 -07:00
Shawn Lin
8e0cd33ae8 Merge "Fix cutout flicker while switch screen resolution" into tm-dev am: 842704d45a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283848

Change-Id: I8279f28b96e4e18fff3888f765beb052ceb4d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 07:04:15 +00:00
Chris Li
7222f49efd Merge "Fix visibility change during entering PIP app transition" into tm-dev am: 7284a6a981 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309444

Change-Id: Iaaa9e1a08a9271c242f6fe33978d3df1e1ede240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 07:03:37 +00:00
Shawn Lin
842704d45a Merge "Fix cutout flicker while switch screen resolution" into tm-dev 2022-05-12 06:48:12 +00:00