Commit Graph

17196 Commits

Author SHA1 Message Date
Treehugger Robot
7845f672bf Merge "Consolidate input OWNERS files" am: 467ebb8379
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: Ie1b6446275299c2941271e433746d0b605404e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 19:01:24 +00:00
Treehugger Robot
467ebb8379 Merge "Consolidate input OWNERS files" 2022-05-18 18:42:33 +00:00
Treehugger Robot
36e6ec949f Merge "Update OWNERS for appwidgets" am: 27e3cc6f2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2100305

Change-Id: Ibe455cb450558808db3f7eed41a92e0953473159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 16:03:01 +00:00
Treehugger Robot
27e3cc6f2b Merge "Update OWNERS for appwidgets" 2022-05-18 15:51:45 +00:00
Pinyao Ting
12adb658a0 Update OWNERS for appwidgets
Test: manual
Change-Id: I2bb2ddc4bd94e9e80d606e5141f336550eab8c88
2022-05-17 22:59:24 +00:00
Hans Boehm
29eb7ad17e Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I5e80ebf68b5faf3215b37bef66631452e7322d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:10:26 +00:00
Hans Boehm
5ee3cfe147 Merge "Document VirtualRefBasePtr hazards" 2022-05-06 23:54:45 +00:00
Treehugger Robot
0db2c732ac Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

Change-Id: I128625d46b2daf19ae7dbb8293f2415b940e9c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 21:16:32 +00:00
Treehugger Robot
1e3e69212a Merge "Set an edit uri to data of ACTION_EDIT" 2022-05-06 20:38:05 +00:00
Hans Boehm
d72e472407 Document VirtualRefBasePtr hazards
Test: Treehugger
Change-Id: I6f364b4e0f73a2eb554f2902a67e774ef5890b00
2022-05-06 11:11:37 -07:00
Xin Li
fd1b1662e9 Merge SP2A.220505.002
Bug: 231319788
Merged-In: I7707d01be37582461227edcecf5d559f2019c8a5
Change-Id: I1dad245a352258f2a0017b85f14c99f305d8d660
2022-05-03 20:53:01 +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
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
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
Albert Wang
cf8d3b0789 Add OWNERS coverage for dump methods for public USB classes
Bug: 229706413
Test: manual

Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: I25c6c649f8fa42fe6a0d3062aa3ab75a4310df37
2022-04-21 08:32:15 +08:00
Koji Fukui
49c433e211 Set an edit uri to data of ACTION_EDIT
Symptom:
Can't transit to edit screen when "Edit" button on ShareSheet is
pressed.

Root cause:
ACTION_SEND intent for shared image is usually sent with image uri in
EXTRA_STREAM extra. But it not always has the uri in data.
ChooserActivity creates ACTION_EDIT intent for "Edit" button from the
ACTION_SEND intent. So it not always has the uri in data. Most of
image edit app suppose to get image uri from data. They usually don't
suppose to get it from EXTRA_STREAM extra. So image is not edited.

Solution:
Copy image uri from EXTRA_STREAM extra to data when ChooserActivity
creates ACTION_EDIT intent.

Bug: 220161786
Test: Take screenshot. Tap share. Tap Edit, which opens
      screenshot in Photos.
Change-Id: Id6ce93efacd54a86d870595ae32b4e6efcec0c04
2022-04-19 10:17:19 +09:00
Xin Li
b2f021295c Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I6541f7d49cb932c85374bf9acf777038b888e873
Change-Id: I95df36a778a7fa9ea52fe0bba2332534d6288032
2022-04-18 21:01:07 +00:00
Jeff Sharkey
33c225a967 Merge "Update VerityUtils OWNERS to a more common file" am: 8f45aff50e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977508

Change-Id: I97f8dccc06fac1e9a0e96c4fa63dfdf42c07c8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 16:51:09 +00:00
Victor Hsieh
e3f86c0534 Update VerityUtils OWNERS to a more common file
Bug: None
Test: N/A
Change-Id: I4d4b9dd0832a6c1ff32e3205014660acd1eb19d4
2022-04-13 15:17:03 +00:00
Bill Yi
bbe0c62d66 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:24 +00:00
Bill Yi
95267eaf87 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: Iae1a66165221f45051be17c4d047b5bd5be3999b
Merged-In: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Change-Id: I2c75988c023cec548e3a576cb0c3a1a13bb0016f
2022-04-07 18:40:59 -07:00
Eric Biggers
4d4ababae0 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Ib029dddb2fd26fa33f231b7ae87c3a1fee737a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 01:36:12 +00:00
Eric Biggers
fb4c1822a8 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I92b1cfccfc0bb657d9d5e1958c5e3e2d4ffc3794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 00:36:33 +00:00
Eric Biggers
7e3c5382cc Merge changes Idc218e5f,I26c3fafc
* changes:
  Remove more FDE methods from StorageManager
  Drop FDE status checks from DevicePolicyManagerService
2022-04-08 00:09:30 +00:00
Eric Biggers
bd13f84152 Remove more FDE methods from StorageManager
Now that these methods are no longer called, and none of them are a
public API or have @UnsupportedAppUsage, they can be removed.

inCryptKeeperBounce() actually had one known app user via reflection,
despite the method not having @UnsupportedAppUsage.  However, that user
only made the call if Build.VERSION.SDK_INT < VERSION_CODES.P, so it is
not being used anymore.

Bug: 208476087
Change-Id: Idc218e5f355bb61257b07cf5b5b6df5f4c6ece11
2022-04-07 16:38:36 +00:00
Chiachang Wang
2194a62f15 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I7d3a2631cd70a342e7f224fcd99ec8eb1e2c77d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:54 +00:00
Chiachang Wang
3caa3cf399 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:38:03 +00:00
Shawn Lin
5e21516057 Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev-plus-aosp 2022-04-06 15:52:33 +00:00
Chiachang Wang
3cb07d737d Ignore other IKE options if IkeTunnelConnectionParams is set
Stop parsing the IKE options from the input IkeTunnelConnectionParams
if exists. The caller shuould get the relevant infortation the
params.

The field is also stored in the VpnProfile if it built from an
Ikev2VpnProfile.

Bug: 184750836
Test: atest FrameworksNetTests HostsideVpnTests
Test: build ; flash ; connect VPN successfully
Change-Id: Id05c17285915462c7a6cd51d5fb4ee5da7f465ba
2022-04-06 17:25:58 +08:00
shawnlin
e901942281 [DO NOT MERGE] Fixed status bar glitch for apps that access internal res
In 12L, to support mulit-display devices, we changed the way to get the
status bar height by adding an API to calculate instead of directly
reading the resource of status_bar_height.

However, some apps still using Resources.getIdentify() to get this
internal resources dimen as status bar height to layout their UI which
cause status bar glitch in their app.

For compatibility purpose:
1. Create a new dimen res status_bar_height_default which will be used
   by framework to determine the status bar heigth
2. For status_bar_height
   - Set the value to the size which already consider the cutout size
     for defualt display as before so that it won't breaking existing
     app.
   - It is only used for apps using Resources.getIdentifier()

Bug: 216782082
Test: verified on the apps with such issue.
Change-Id: I306efa187ffa69223c06fd248cfe57d183f96c59
2022-04-04 03:21:03 +00:00
Xin Li
4b9118275b Fixup OWNERS file merge conflicts.
Change-Id: I8948b1361211825cc45f049f6484dc290620801b
2022-04-01 21:00:58 +00:00
Xin Li
0bb254bd3f Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Id7458a889e8b084a260b18f56db315ee1317b3a6
Change-Id: I4819065c2c2adb24d08fb1e32eefd6f335a1ec48
2022-04-01 20:32:30 +00:00
Eric Biggers
cd42593479 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979

Change-Id: I3fbe51313843c63950cb0e3d8141b88f79d41d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:42:11 +00:00
TreeHugger Robot
9d9976b68f Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I472e4dc6a9b0ae0f8f76e2b620ec59e53aba0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:39:43 +00:00
TreeHugger Robot
f709e34b90 Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev 2022-03-29 20:19:40 +00:00
Eric Biggers
54bdf65cb5 Remove FDE warning from AccessibilityShortcutChooserActivity
This encryption warning is never shown, since
StorageManager.isNonDefaultBlockEncrypted() is hard-coded to return
false, since FDE (Full Disk Encryption) is no longer supported.
Therefore, remove an unused TextView and string, and stop calling
StorageManager.isNonDefaultBlockEncrypted().

Remove the word "encryption" from the layout name
"accessibility_enable_service_encryption_warning", since this layout
is still used for other, non-encryption related warnings.

Bug: 208476087
Change-Id: Ic4e9024eadd602205516aa3ba4cc01887a2a7d34
2022-03-28 23:52:06 +00:00
Michael Wachenschwanz
b1b7910ff4 Merge "Ref count isolated uid use for long partial wakelocks" into sc-v2-dev 2022-03-23 21:12:01 +00:00
Michael Wachenschwanz
bd1eff5cef Merge changes from topic "presubmit-am-7620ad0417cd498ea02e09cd0ecc98e9" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Ref count isolated uid use for long partial wakelocks 2p: f548942f3f
  Ref count isolated uid use for long partial wakelocks
2022-03-23 21:12:01 +00:00
TreeHugger Robot
d53d398625 Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2
  Fix ServiceConnector failing unbind if not connected.
2022-03-23 18:35:38 +00:00
Rambo Wang
72f706f60a Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I33770b31f15362225e0190557afbbdda144f742f
2022-03-23 14:26:27 +00:00
Presubmit Automerger Backend
34f0951f96 [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988


Change-Id: If7c0bf7ab6c89e98bdecbc1ef98bf93313fa8176
Merged-In: I6a8c01390130bcec9aff1460004343ca2b207031
2022-03-23 09:33:53 +00:00
Ahaan Ugale
efc50877d2 Fix ServiceConnector failing unbind if not connected.
ServiceConnector does not call unbindService when requested to unbind if
the service isn't currently connected. This causes issues like leaving
zombie Trusted Hotword processes bound forever if the process is stopped
('restarted') immediately after being created (say if audio server
crashes twice in quick succession).

Fix: 223845998
Test: manual - locally comment out code that immediately connects the
 service, then `for i in {1..10}; do adb shell cmd voiceinteraction\
 restart-detection; done` - without fix results in an extra process
Change-Id: I6a8c01390130bcec9aff1460004343ca2b207031
Merged-in: I6a8c01390130bcec9aff1460004343ca2b207031
(cherry picked from commit 52e0dafcb3)
2022-03-23 09:33:37 +00:00
Rambo Wang
aa1e3b0a67 Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener
Add new interface in CarrierPrivilegesCallback to notify the registrants
that carrier service for current user has changed.

Reshape the parameters of onCarrierPrivilegesChanged callback with
both Set instead of List/Array.

CarrierPrivilegesListener is deprecated. Once all clients have migrated
to CarrierPrivilegesCallback, it will be throughly cleaned up.

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest

Change-Id: I18e443d91f1db951f1461511821c0f5f673da3a3
Merged-In: I38d03e3921112c313f3c1d204ed04f6e1756ff39
(cherry picked from commit b66e3e3aa8)
2022-03-22 20:45:05 -07:00
Eric Biggers
e1a9ca0ec8 Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07 am: 84f05b1b9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031025

Change-Id: Id7be68ef1c367fb461236a0c14b4dbb8e0ca5bdd
2022-03-22 17:47:04 +00:00
Eric Biggers
489ba5ac07 Merge "Stop using FDE-related constants from IVold" 2022-03-22 17:37:32 +00:00
Michael Wachenschwanz
05dcf05246 Fix mobile radio battery consumption double counting
On ODPM enabled devices, the total mobile radio power consumption was
being used when reporting the idle/suspended power. This means app
mobile radio power consumption was effectively being double counted.

Bug: 209525694
Test: atest MobileRadioPowerCalculatorTest
Change-Id: Ibc1a504014ac10c285b71273ba50493ba237f6a9
Merged-In: Ibc1a504014ac10c285b71273ba50493ba237f6a9
2022-03-21 23:45:31 +00:00
Presubmit Automerger Backend
67266c9682 [automerge] Ref count isolated uid use for long partial wakelocks 2p: f548942f3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17229945

Bug: 218298973
Change-Id: I1f7c23a58c725917cf27a85a4ec3b02e8a44af19
Merged-In: I86456137e6d6ad47f9974da281defc04d20fb32f
2022-03-21 23:00:19 +00:00
Michael Wachenschwanz
f548942f3f Ref count isolated uid use for long partial wakelocks
The isolated uids need to be kept in the map while it is holding a long
partial wakelock.

Bug: 218298973
Test: atest BatteryStatsNoteTest
Change-Id: I86456137e6d6ad47f9974da281defc04d20fb32f
(cherry picked from commit fd48aa6fa6)
Merged-In: I86456137e6d6ad47f9974da281defc04d20fb32f
2022-03-21 15:48:23 -07:00
Treehugger Robot
af02ce3a8e Merge "Add i18n Settings OWNER for system language settings" am: 06da2b3f5c am: 11f453bf93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033224

Change-Id: I3ceb4c857eb22b06d6d9b8e097c404e17d94c004
2022-03-21 21:17:34 +00:00
Calvin Pan
6cac5b89c0 Add i18n Settings OWNER for system language settings
Change-Id: Ia3217df6478716ec51b891057ba57a4d53a716ca
2022-03-21 09:06:57 +00:00