Commit Graph

691823 Commits

Author SHA1 Message Date
Nikita Ioffe
1b11ca259f Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077481

Change-Id: I0334ae85b0a2daed3e268329257256f2236d1f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 09:41:22 +00:00
Nikita Ioffe
df27cf8d48 Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" 2022-04-28 09:16:15 +00:00
Kalesh Singh
f72a1a5973 Merge "Add experiment flag namespace for Multi-Gen LRU" am: d7145d4c0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056441

Change-Id: Ib56244695cdfaa4c58cccbbc83950ad688e0b180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:36:02 +00:00
Kalesh Singh
d7145d4c0f Merge "Add experiment flag namespace for Multi-Gen LRU" 2022-04-27 21:10:53 +00:00
Treehugger Robot
945d15b1fc Merge changes from topic "227137943" am: 2f48177cbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076399

Change-Id: Ic3b34c28165ac221b38ddeb276ceedcf9c30b336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:40:10 +00:00
Badhri Jagan Sridharan
4a61540d9f Support IUsb AIDL interface am: b09d68a2ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046443

Change-Id: Icdb81cefb211ac84cd41307a26aa1beee048118f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Lucas Lin
d592422bc7 Merge changes I4bfaf79a,I8711187e am: 0a4fd7e9ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073067

Change-Id: I2602d772c7d734a89f239dffe9d568213e0d3333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:27:28 +00:00
Treehugger Robot
2f48177cbe Merge changes from topic "227137943"
* changes:
  Implement getInterfaceHash/Version (USB)
  Support IUsb AIDL interface
2022-04-27 16:21:29 +00:00
Lucas Lin
0a4fd7e9ea Merge changes I4bfaf79a,I8711187e
* changes:
  Ensure IkeV2VpnRunnerCallback is always called by the mExecutor thread
  Add equals() & hashCode() for VpnProfileState
2022-04-27 15:34:15 +00:00
Nikita Ioffe
c6c98bdf5c Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades
The v2_apk_in_apex_upgrades APEX shim will be useful for testing fixes
for apk-in-apex caching bug.

Test: m com.android.apex.cts.shim.v2_apk_in_apex_upgrades
Bug: 225435110
Change-Id: I5d2270b8341c0405bf256c417acff4279c6b8754
2022-04-27 14:04:38 +01:00
Steven Moreland
e91347a53b Implement getInterfaceHash/Version (USB)
As these interfaces get frozen, java services
implementing the interfaces are required to implement getInterfaceHash
and getInterfaceVersion [1]

[1]
https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods

Bug: 190577319
Test: m
Change-Id: I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f
Merged-In: I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f
(cherry picked from commit 1b46333208)
2022-04-26 16:05:53 +08:00
Badhri Jagan Sridharan
b09d68a2ea Support IUsb AIDL interface
UsbPortManager is made to support both AIDL & HIDL interface until
HIDL is deprecated eventually. UsbPortHal abstract class is defined
which the UsbPortManager grabs an instance of from UsbPortHalInstance
method to talk to the Hal implementation process. UsbPortHalInstance
queries the underlying hal implementation and instantiates UsbPortHal
with either UsbPortHidl or UsbPortAidl based on the IUsb interface
implemented by HAL implementation.

go/iusb-aidl-migrate.

Bug: 200993386
Bug: 199357330
Bug: 211677613
Bug: 213312081
Bug: 199358576
Test: Manually tested through UI.
CTS-Coverage-Bug: 215019881
Change-Id: I246fd6e5bee8138d3ad3b6994665a1d4788c8789
Merged-In: I246fd6e5bee8138d3ad3b6994665a1d4788c8789
(cherry picked from commit bbfa92e694)
2022-04-26 16:04:13 +08:00
Colin Cross
ff8212309d Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072001

Change-Id: I00ff987c0fd87fd67b296b41ca19e8484a4a085f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 01:50:29 +00:00
Colin Cross
2a3aa26b06 Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" 2022-04-26 01:15:38 +00:00
Suren Baghdasaryan
bf58a32851 Merge "Treat failure to create a process group as fatal" am: 75eb24817b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2053131

Change-Id: I70764df97c8d18ed16c6f1e4e0562852ea1b5550
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:40:51 +00:00
Suren Baghdasaryan
75eb24817b Merge "Treat failure to create a process group as fatal" 2022-04-25 17:05:29 +00:00
Treehugger Robot
f98042032a Merge "Advise use of InputDeviceListener when using pointer capture" am: 5ec8916af2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2074599

Change-Id: I97a33543b550bfc379e1d336872a7888f34fbd89
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 16:22:08 +00:00
Treehugger Robot
5ec8916af2 Merge "Advise use of InputDeviceListener when using pointer capture" 2022-04-25 16:01:08 +00:00
lucaslin
5401c8667d Ensure IkeV2VpnRunnerCallback is always called by the mExecutor thread
Bug: 229799060
Test: atest FrameworksNetTests:VpnTest
      atest CtsNetTestCases:Ikev2VpnTest
Change-Id: I4bfaf79abaad3cec6f6629fb8bc885a4916a820b
2022-04-25 22:19:38 +08:00
Prabir Pradhan
98e54bb941 Advise use of InputDeviceListener when using pointer capture
InputDevices can be reconfigured when pointer capture changes, but the
app will be notified via InputManager when the updated device
information is available. This races with the onPointerCaptureChange
callback, so advise the use of InputDeviceListener in the pointer
capture documentation for developers to get around this.

Bug: 226425883
Test: None
Change-Id: I7aeb23722dc40b8fd37cb9667a4f23a336e8b5f1
Merged-In: I7aeb23722dc40b8fd37cb9667a4f23a336e8b5f1
2022-04-25 11:53:49 +00:00
lucaslin
c867675e38 Add equals() & hashCode() for VpnProfileState
Bug: 225010642
Test: atest FrameworksNetTests:VpnTest
Change-Id: I8711187e690385866fa681c3fe5fccdf353ac30b
2022-04-25 16:14:58 +08:00
Treehugger Robot
79f8886cb4 Merge "Fix KNOWN_CODENAMES javadoc to mention that all codenames are there." am: 8f721b9229
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072000

Change-Id: I1dc9cda49797b1ed3b8e6f6e89b6991613c0e6ba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:21:19 +00:00
Treehugger Robot
8f721b9229 Merge "Fix KNOWN_CODENAMES javadoc to mention that all codenames are there." 2022-04-22 19:52:05 +00:00
Jeff Sharkey
48dff0549a Merge "Add OWNERS coverage for dump methods for public USB classes" am: 25976ab7be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063672

Change-Id: I7bb943bbbad96bae9f43bf03da417a56c4eece9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 17:12:24 +00:00
Suren Baghdasaryan
d01f170598 Treat failure to create a process group as fatal
During process startup, system creates a process group and places the
new process in it. If process group creation fails for some reason, the
new child process will stay in its parent's group. This poses danger
when the child is being frozen because the whole group is affected and
its parent is being frozen as well. Considering that the parent of an
app is Zygote, freezing it leads to the device becoming unusable.
Fix this by treating group creation failure as a fatal error which would
prevent the app from starting. When system_server fails to create a
process group, it will throw an exception that's not caught and will
self-destruct.

Bug: 227395690
Test: fake group creation failure and confirm app failure to start
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ib34b4a100c65a9a2705aaef8e7e32322fbedc531
2022-04-22 16:51:02 +00:00
Jeff Sharkey
25976ab7be Merge "Add OWNERS coverage for dump methods for public USB classes" 2022-04-22 16:48:34 +00:00
Colin Cross
b0b0bb9882 Add UpsideDownCake to aapt2 codenames and android.os.Build
Bug: 219519679
Test: m checkbuild
Change-Id: I2b668d1cd875657b27a1d52bda21f238d7020862
Merged-In: I2b668d1cd875657b27a1d52bda21f238d7020862
(cherry picked from commit d27566da4c)
2022-04-22 09:17:01 -07:00
satayev
337762d9c6 Fix KNOWN_CODENAMES javadoc to mention that all codenames are there.
Bug: 220153433
Test: atest BuildTest
Change-Id: I93cade7cb11e34557445b74d1e1841508061d616
Merged-In: I93cade7cb11e34557445b74d1e1841508061d616
(cherry picked from commit 82d33f26f9)
2022-04-22 09:17:01 -07:00
Yi-yo Chiang
e851a32f38 Merge "DSU: Only try to install on sdcard if the filesystem in use is vfat" am: 0f8d10381a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2070007

Change-Id: I1220a5b5084372b0042dbf86a61be93846db1588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:39:26 +00:00
Jay Aliomer
8371cf9fd7 Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot" am: 5b1ff7891b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062852

Change-Id: Ife43574f02d3778bf8f1c0795942c97545c6834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:38:38 +00:00
Aaron Huang
d47cadad4e Merge "Have NetworkPolicyManagerService listen onLinkPropertiesChanged callback" am: e441813c5f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063315

Change-Id: I657975376c3570d75275c57de481fdbcc9a78082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:37:54 +00:00
Yi-yo Chiang
0f8d10381a Merge "DSU: Only try to install on sdcard if the filesystem in use is vfat" 2022-04-22 15:18:14 +00:00
Jay Aliomer
5b1ff7891b Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot" 2022-04-22 15:14:57 +00:00
Aaron Huang
e441813c5f Merge "Have NetworkPolicyManagerService listen onLinkPropertiesChanged callback" 2022-04-22 15:06:34 +00:00
Songchun Fan
4d83b6f32c Merge "Add the compile reason for the forceDexOpt method." am: 1a1ed211b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2071188

Change-Id: I82af4785265db747315c7a6f542d71dd135bd5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 14:03:02 +00:00
Songchun Fan
1a1ed211b6 Merge "Add the compile reason for the forceDexOpt method." 2022-04-22 13:40:24 +00:00
Sameer Zalke
3847d7ed9a Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot
Dark theme "TURN ON UNTIL SUNRISE"/MODE_NIGHT_AUTO is not kept after
reboot. The reason is that TwilightState will takes time to update
so lastState will be null in updateConfigurationLocked().
This lead to a reset of mComputedNightMode and mOverrideNightModeOn.

This is a special bug for "TURN ON UNTIL SUNRISE"/MODE_NIGHT_AUTO,
the other ones work fine and should not be touched, if we do not
treat this as a special case we break the other ones.

Test: Select "TURN ON UNTIL SUNRISE" in Dark Theme and reboot.
Bug: 229228293
Change-Id: Ie32a6ddbbf03fa43ee6dd5e35b3c35ec03e58e0e
2022-04-22 11:15:12 +00:00
Lucas Lin
990e43f4cc Merge changes I7fd4b6da,Ia36d7944,If7eb7e0e am: 54a348cf84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065434

Change-Id: I1c905f43fad615f777678e0579393f12796ddf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 09:22:49 +00:00
Lucas Lin
54a348cf84 Merge changes I7fd4b6da,Ia36d7944,If7eb7e0e
* changes:
  Modify javadoc for some extra values of VpnManager event
  Add toString() for VpnProfileState
  Move mSessionKey into Ikev2VpnRunner and make it to be a final var
2022-04-22 08:59:24 +00:00
Treehugger Robot
fdb701f31d Merge "javaObjectForIBinder: warn rets global and local" am: 2abd02381f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067811

Change-Id: If01e9a87aba9c79ae059a8e2dfc174680131a021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:17:16 +00:00
Treehugger Robot
2abd02381f Merge "javaObjectForIBinder: warn rets global and local" 2022-04-22 01:30:45 +00:00
lucaslin
4b6b7987a1 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
2022-04-22 09:28:28 +08:00
lucaslin
6a75e5a3c5 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
2022-04-22 09:28:21 +08:00
lucaslin
1cb9f6181b Move mSessionKey into Ikev2VpnRunner and make it to be a final var
mSessionKey is initialized in the constructor of Ikev2VpnRunner,
move it into Ikev2VpnRunner and make it to be a final var can
make sure that mSessionKey is initialized before someone access
it.

Test: atest FrameworksNetTests:VpnTest
Change-Id: If7eb7e0ec8ab42b17a5636aeced65385e7849b6a
2022-04-22 09:28:05 +08:00
heqiang1008 thundersoft
1a0eb16cbe Add the compile reason for the forceDexOpt method.
Change-Id: I4f87b2e4d58ba288b454f4e15768ca84cf807c8c
Merged-In: Ic3cef72627985bb906e87b875c180a7dc32a295f
2022-04-21 22:50:03 +00:00
Mitch Phillips
65b39e8f66 Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" am: a50c4137e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040626

Change-Id: I2938b379266633eeb74b9cb5619298920e18480f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 18:32:15 +00:00
Mitch Phillips
a50c4137e3 Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" 2022-04-21 18:12:44 +00:00
Benedict Wong
d868725c8c Merge "Add CarrierConfig to TelephonySubscriptionSnapshot" am: 59aeaf29c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063410

Change-Id: I5e09fea770734d71241008395045dd9ddddc0ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:51:46 +00:00
Treehugger Robot
8428f9e7cd Merge "fix API description on how to round average qp" am: 1c0277d78d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067619

Change-Id: Ib4ec8372d8f63bc6d7d73ac60aa40dd7ead097a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:51:28 +00:00
Benedict Wong
59aeaf29c0 Merge "Add CarrierConfig to TelephonySubscriptionSnapshot" 2022-04-21 17:40:58 +00:00