Commit Graph

653344 Commits

Author SHA1 Message Date
TreeHugger Robot
27df379840 Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev am: 7949cf90ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523913

Change-Id: I20606064a364bd97f4dd93f7f6cce8a0acdc3f7f
2021-08-13 17:39:28 +00:00
TreeHugger Robot
7949cf90ac Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev 2021-08-13 17:29:14 +00:00
Jayant Chowdhary
28dcfc3a28 Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev am: 115b62decc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15507831

Change-Id: I1d36d170b6aaad82db2ba3924fbaa5a5dd3c0744
2021-08-13 17:25:54 +00:00
TreeHugger Robot
5dfec7560c Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522464

Change-Id: I091612c70946895958473d86e30065bebe1395c2
2021-08-13 17:22:03 +00:00
Jayant Chowdhary
115b62decc Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev 2021-08-13 17:11:23 +00:00
TreeHugger Robot
1ce567e28f Merge "Camera: Return sequence id for advanced extension requests" into sc-dev 2021-08-13 17:09:56 +00:00
Philip Junker
c518d5d3ce Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev am: c20398b8d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15462072

Change-Id: I9f5da7d2e54f1c912c1f5f090ffc585078bcf401
2021-08-13 14:00:51 +00:00
Philip Junker
c20398b8d1 Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev 2021-08-13 13:49:37 +00:00
Jeff Sharkey
512bc4c6ec Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I7e3ef6ca49e2c4ed4a4876b23ae5889c257f4f2f
2021-08-13 13:10:06 +00:00
Jeff Sharkey
01034e6e61 Merge "Register IBluetoothManagerCallback per-process." into sc-dev 2021-08-13 12:54:27 +00:00
TreeHugger Robot
50df41af58 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I0a7ee79b03854312fe55a0a7b7090dbb087007eb
2021-08-13 02:46:12 +00:00
TreeHugger Robot
b1c1ae9517 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev 2021-08-13 02:34:36 +00:00
Yu-Ta Lu
0eb1cadad0 Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: I8bd9a98142d6437dae03923ab782b2d04c2ca372
2021-08-13 00:45:35 +00:00
Yu-Ta Lu
9c219f140f Merge "Replace private attributes with public resources." into sc-dev 2021-08-13 00:32:04 +00:00
Jooyung Han
cde3534eb1 Merge "AIDL: use typed Map" am: 72d5595e0e am: aa0551424c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I269ec562d6e1441cdbd9ce48e8f9737d6ab3fd21
2021-08-12 23:39:19 +00:00
Chris Li
c31e052182 Merge "Fix thread safety issues;" am: a1431a8227 am: 3b65b029c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I6bf7d4ee71d9d6a409179e440f33fc0596d84897
2021-08-12 23:38:47 +00:00
Jooyung Han
aa0551424c Merge "AIDL: use typed Map" am: 72d5595e0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I2757de388bfa22023c4a710c4677b04cd049efff
2021-08-12 23:24:13 +00:00
Chris Li
3b65b029c5 Merge "Fix thread safety issues;" am: a1431a8227
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I0a21018e46acffa35c9e337b1f39d381c98a1754
2021-08-12 23:23:56 +00:00
Jooyung Han
72d5595e0e Merge "AIDL: use typed Map" 2021-08-12 23:14:53 +00:00
Joe Bolinger
6241cf6b27 Merge "Remove new task flag when launching unicorn enrollment." into sc-dev am: afe9dad1da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521773

Change-Id: Ib020b0766cb3a1001adfb0265402367fe2cdfaec
2021-08-12 23:09:23 +00:00
Chris Li
a1431a8227 Merge "Fix thread safety issues;" 2021-08-12 23:07:32 +00:00
Joe Bolinger
afe9dad1da Merge "Remove new task flag when launching unicorn enrollment." into sc-dev 2021-08-12 22:57:38 +00:00
TreeHugger Robot
3e7436fc30 Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am: 66d5c60581
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529225

Change-Id: If69a9a5707f42df449627272836ab088f3570d5f
2021-08-12 18:27:45 +00:00
Ray Essick
e7cd1a0df0 Merge "Rename android.media.MediaTranscodeManager -> MediaTranscodingManager" into sc-dev am: 9d0e91c7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521772

Change-Id: I871700668bd029ef46f184aa618620e634de1443
2021-08-12 18:26:14 +00:00
TreeHugger Robot
66d5c60581 Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev 2021-08-12 18:19:18 +00:00
Ray Essick
9d0e91c7b6 Merge "Rename android.media.MediaTranscodeManager -> MediaTranscodingManager" into sc-dev 2021-08-12 18:06:55 +00:00
TreeHugger Robot
5f5eb7ff2e Merge "Reduce background FGS start WTF log messages." into sc-dev am: f544ad608a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476077

Change-Id: I0377e140a69c191e67fa5de453655b34eb6e41ff
2021-08-12 17:22:46 +00:00
TreeHugger Robot
f544ad608a Merge "Reduce background FGS start WTF log messages." into sc-dev 2021-08-12 17:07:38 +00:00
Mill Chen
5c84edacf0 Replace private attributes with public resources.
The change replaces all existing usage of private resources in
SettingsLib with corresponding public resources. The only exception
is android:string/config_headlineFontFamily where there's no proper
replaccement.

The library is currently used by bundled apps (such as SettingsGoogle)
and unbundled apps (such as PermissionController and
CellBroadcastReceiver). Since we still want these bundled apps to
reference config_headlineFontFamily properly while not breaking
unbundled apps due to them referencing private attributes, we added a
new attribute settingslib_config_headlineFontFamily (alongside with
other FontFamily variance for completeness) in
SettingsTheme/res/values-v31/strings.xml which points to
config_headlineFontFamily by default. Then, in separate CLs, we will add
resource overrides to these unbundled apps to replace the value of
settingslib_config_headlineFontFamily to point to a public value. While
this means that the style of the pages from the unbundled apps will be
different from the rest of SettingsLib clients, the change provides a
tactical fix to make sure that these unbundled apps won't crash when
shipped to other devices. We can address the issue at its core by
potentially exposing some private resources in future Android releases.

Bug: 191387775
Bug: 190964071
Bug: 196106314
Test: manual test to confirm this is a no-op CL.
Change-Id: Ie25950d9f54964aa40038a27b302ed017e4e4d15
2021-08-12 23:52:16 +08:00
Riddle Hsu
5f95d3af26 Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0 am: 7f2cb4c0a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793211

Change-Id: I00ebb6e21e6ad6f641fe52249b27cd59b77f9da6
2021-08-12 11:41:28 +00:00
Riddle Hsu
7f2cb4c0a5 Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793211

Change-Id: I27e6901083d1f16c2b2bcccb77627c81592d4ceb
2021-08-12 10:03:21 +00:00
Riddle Hsu
99e5c70ff0 Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" 2021-08-12 09:50:46 +00:00
Jooyung Han
553c027bbf AIDL: use typed Map
AIDL supports typed maps, so use it instead of untyped one.

Bug: 192615532
Test: m, TH presubmit
Change-Id: I0fedf05872cbe2025e04ca07ce6c90bc9067b331
2021-08-12 08:38:10 +00:00
Ray Essick
1168d9d014 Rename android.media.MediaTranscodeManager -> MediaTranscodingManager
renamed to avoid conflict with existing copy in the R framework.jar.
The framework.jar copy was removed during S development

Bug: 195608856
Test: build
Test: cts-tradefed run cts -m CtsMediaTranscodingTestCases
Change-Id: I40ab066cd61be8d278f21cc788016f2edd6bb86e
2021-08-12 07:42:56 +00:00
TreeHugger Robot
3103f612ba Merge "Allow negative value for CorrelationVector#samplingStartM" into sc-dev am: a5117ca3b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515230

Change-Id: I5ab6f3bc16bf41047d27bb0051b2aa5ff8ca688a
2021-08-12 07:30:57 +00:00
TreeHugger Robot
a5117ca3b4 Merge "Allow negative value for CorrelationVector#samplingStartM" into sc-dev 2021-08-12 07:17:47 +00:00
Ashok Mutyala
895d981852 Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()
Problem: Framework Reboot i.e., NullPointer Exception in android.ui Thread
E AndroidRuntime: FATAL EXCEPTION IN SYSTEM PROCESS: android.ui
E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method
'java.lang.Object android.content.Context.getSystemService(java.lang.String)' on a null object reference

E AndroidRuntime: **at android.app.Dialog.<init>(Dialog.java:199)
E AndroidRuntime: **at android.app.AlertDialog.<init>(AlertDialog.java:204)
E AndroidRuntime: **at android.app.AlertDialog.<init>(AlertDialog.java:200)
E AndroidRuntime: **at com.android.server.am.BaseErrorDialog.<init>(BaseErrorDialog.java:39)
E AndroidRuntime: **at com.android.server.am.AppNotRespondingDialog.<init>(AppNotRespondingDialog.java:53)
E AndroidRuntime: **at com.android.server.am.ErrorDialogController.showAnrDialogs(ErrorDialogController.java:183)
E AndroidRuntime: **at com.android.server.am.AppErrors.handleShowAnrUi(AppErrors.java:1077)

Analysis:
As Context Object is passed from showAnrDialogs method and will be retrieved from getDisplayContextWithErrorDialogs
And list of context objects will be filled by querying from RootWindowContainer.getDisplayUiContext and this method is
Annotated with Nullable. So, the possibility could be null value filled in the context object List.

Bug: 196189977
Test: Stability Test

Change-Id: Ib944fc5ffc8bcca999c75f99d462d441e555fcda
2021-08-12 04:31:18 +00:00
Nate Jiang
4304d409e4 Merge "Remove modules-utils-build_system from filegroup" am: a4d60ac1ee am: f46dc85e5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1792931

Change-Id: Ib8693132319dc21d0a78f98e1dc74f2b6bca1790
2021-08-12 02:25:56 +00:00
Nate Jiang
f46dc85e5a Merge "Remove modules-utils-build_system from filegroup" am: a4d60ac1ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1792931

Change-Id: If693bdf1ee36e6997373bb70fd390b32d7329a7e
2021-08-12 02:11:28 +00:00
Nate Jiang
a4d60ac1ee Merge "Remove modules-utils-build_system from filegroup" 2021-08-12 01:56:33 +00:00
Suren Baghdasaryan
5c822bf4ea [automerger skipped] Merge "Adding native flag namespace for lmkd." am: 1fdacf6376 am: eb10acc1cb -s ours
am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 93c48c704a is already in history

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

Change-Id: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
2021-08-11 23:28:31 +00:00
Suren Baghdasaryan
eb10acc1cb Merge "Adding native flag namespace for lmkd." am: 1fdacf6376
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786787

Change-Id: I8d661ad5868a7df5df08e67574bcd1eda9092772
2021-08-11 23:13:07 +00:00
Suren Baghdasaryan
1fdacf6376 Merge "Adding native flag namespace for lmkd." 2021-08-11 22:56:11 +00:00
Evan Severson
4fa06df1b8 Fix boot loop when upgrading sensor privacy file
Also add new testcase for sensor privacy service boot.

Test: atest SensorPrivacyServiceMockingTest CtsSensorPrivacyTestCases
      Manually test booting with old file version
Fixes: 195913883
Change-Id: I9d8791e5f27c881afd9e23f94fb5fb9dc891fda4
2021-08-11 15:19:41 -07:00
Rob Carr
ba8979c6d7 Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521640

Change-Id: Iedcc5f3ca75f9ffd022c14076ed05c06c874d3b4
2021-08-11 22:11:18 +00:00
Rob Carr
ccdb324274 Merge "Update wallpaper offset when changing target from null" into sc-dev 2021-08-11 21:58:32 +00:00
Makoto Onuki
a33d48c48e Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev am: 0c1dc2fc76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15484572

Change-Id: Ic11bfc07ac3ad19222bcc48dc7e54f46a1af6fe6
2021-08-11 21:35:25 +00:00
Makoto Onuki
0c1dc2fc76 Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev 2021-08-11 21:17:20 +00:00
Jayant Chowdhary
1f3071d540 camera2: Documentation updates for ultra high resolution sensors.
Bug: 195987968

1) Document mininum pixel array size restriction for ultra high resolution sensors.
2) Add docs explaining mandatory stream combinations for ultra high resolution sensors.

Change-Id: Ic630259a57906c475210465588eda1a5cc3f68ec
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-08-11 20:12:41 +00:00
Jeff Sharkey
f0fa7f9b4a Register IBluetoothManagerCallback per-process.
As part of introducing AttributionSource across the Bluetooth stack
earlier this year, each BluetoothAdapter instance is now associated
with a specific AttributionSource, and several instances of shared
static code were made BluetoothAdapter-specific so they could be
augmented with the relevant AttributionSource.

However, processes that create many BluetoothAdapter instances can
overload the system, since a IBluetoothManagerCallback was registered
for each instance.  This change mitigates this by only registering a
single IBluetoothManagerCallback for the entire process, and it
then reuses the existing sProxyServiceStateCallbacks list for
dispatching events to all active adapters within the process.

Since it's so late in the release, we keep both mService and
sService intact to minimize the size of this CL; future work should
refactor to a more robust design, such as Supplier<IBluetooth>.

Bug: 195286998, 172022978
Test: atest BluetoothInstrumentationTests
Change-Id: I012f3f65e61eaf55e40436486806e56506c928ee
2021-08-11 12:23:01 -06:00