Commits · 93901f87e87ddf7fad5f1a183185db5135fe62dc · Farzin Kazemzadeh / platform_frameworks_base-old

Nov 30, 2023

Merge "MGF1 Digest setter: Handle case of flag off" into main am: · 93901f87

Eran Messeri authored 1 year ago

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

Change-Id: Ia5a5fa64547dbdc691e2f11fb55ba646cc34a0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

93901f87

Merge "MGF1 Digest setter: Handle case of flag off" into main · e0ad83b3
Eran Messeri authored 1 year ago

e0ad83b3

MGF1 Digest setter: Handle case of flag off · e0c8ad86

Eran Messeri authored 1 year ago

In case the MGF1 Digest setter flag is turned off (that is, it is not
possible to specify MGF1 Digests using the new API introduced), then the
old behaviour has to take place.

The old behaviour was to set all primary digests specified, as MGF1 Digests.
This behaviour has been added when the flag isn't set.

Bug: 308378912
Bug: 308069562
Test: atest CtsKeystoreTestCases:android.keystore.cts.CipherTest#testKatBasicWithDifferentProviders CtsKeystoreWycheproofTestCases:RsaOaepTest
Change-Id: I5d4541ce952e1bad7c8fdd55a00176274b0b66f3

e0c8ad86

Merge "Change BackgroundDexoptJobStatsLogger#write to report the pass." into main am: · 2c47c49d

Jiakai Zhang authored 1 year ago

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

Change-Id: I5e355da63ff0bc2973ab580d16eec7c6e7342ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2c47c49d

Merge "Change BackgroundDexoptJobStatsLogger#write to report the pass." into main · 3c95438e
Jiakai Zhang authored 1 year ago

3c95438e

Merge "Avoid log spam for the common "no user keys" case." into main am: · ce85087e

Elliott Hughes authored 1 year ago

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

Change-Id: I59dc01cf9adbf8c4f41bbbb364b9b9689bf0e5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ce85087e

Merge "Avoid log spam for the common "no user keys" case." into main · 357d9ae6
Elliott Hughes authored 1 year ago

357d9ae6

Merge "Rename the fix_unlocked_device_required_keys flag" into main am: · a1ff339e

Eric Biggers authored 1 year ago

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

Change-Id: Ibeef3e9825cbec22e8a395a0e25903c3469baff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a1ff339e

Merge "UserDataPreparer: be more careful about auto-deleting data on error"... · dc68b570

Eric Biggers authored 1 year ago

Merge "UserDataPreparer: be more careful about auto-deleting data on error" into main am: 2506df92

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

Change-Id: Ica9cdcb38454ec18d4ce097d8919d5b6e0474914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dc68b570

Nov 29, 2023
- Merge "Rename the fix_unlocked_device_required_keys flag" into main · b932bbb9
  Eric Biggers authored 1 year ago
  
  b932bbb9
- Merge "UserDataPreparer: be more careful about auto-deleting data on error" into main · 2506df92
  Eric Biggers authored 1 year ago
  
  2506df92
- Change BackgroundDexoptJobStatsLogger#write to report the pass. · 850b468c
  Jiakai Zhang authored 1 year ago
  
  Bug: 242170869 Test: m Change-Id: Ie7e39c8db95d66033f77881dc076099664e0bb2d
  850b468c
- Merge "Adding myself as flags owner" into main am: 3d219e06 · 784b58f2
  Eran Messeri authored 1 year ago
  
  Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852405 Change-Id: I9f88eb299bd2be466ea10762b2bd4c8b1155a69d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
  784b58f2
- Merge "Adding myself as flags owner" into main · 3d219e06
  Eran Messeri authored 1 year ago
  
  3d219e06
- Adding myself as flags owner · 144e40d8
  Eran Messeri authored 1 year ago
  
  Add myself as an owner for the flags file, so that I can approve changes in the EMEA timezone. Bug: n/a Test: n/a Change-Id: Id32d3c65a7794477d47ed5ebe7471aacd04b6923
  144e40d8
- Merge "StorageManager: remove old isFileEncrypted* methods" into main am: 03bf8643 · c0dae121
  Eric Biggers authored 1 year ago
  
  Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768549 Change-Id: I99eefc8b85cee1c0119e0dcb7092025a0be1d78f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
  c0dae121
Nov 28, 2023

Merge "StorageManager: remove old isFileEncrypted* methods" into main · 03bf8643
Eric Biggers authored 1 year ago

03bf8643

Merge "Mark Message.peekData as returning a nullable value." into main am: · ef6101d5

Mateus Azis authored 1 year ago

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

Change-Id: I4eac02aaf2db7985859b8752659c5f7a2f833c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ef6101d5

Merge "Mark Message.peekData as returning a nullable value." into main · 9727fd34
Mateus Azis authored 1 year ago

9727fd34

Merge "Add gaillard@ as the OWNER of Watchdog.java" into main am: · 39f2ec52

Treehugger Robot authored 1 year ago

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

Change-Id: I50fbec979e071741fe235369c88b653e971b2f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39f2ec52

Merge "Add setBackdropRenderEffect for View and RenderNode." into main am: · efc1ef76

John Reck authored 1 year ago

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

Change-Id: I11ac30f89b8f34f58d6128bcad9eb61887560136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

efc1ef76

Merge "Update exception thrown for keystore" into main am: · 242534fe

Shaquille Johnson authored 1 year ago

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

Change-Id: I5f1665bad2ace81b57f1015f588e40df39fb6c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

242534fe

Merge "Add gaillard@ as the OWNER of Watchdog.java" into main · c9056845
Treehugger Robot authored 1 year ago

c9056845
Merge "Add setBackdropRenderEffect for View and RenderNode." into main · e93a68ed
John Reck authored 1 year ago

e93a68ed
Merge "Update exception thrown for keystore" into main · a7f6cb18
Shaquille Johnson authored 1 year ago

a7f6cb18

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: · 28bc1640

Timothy Yiu authored 1 year ago

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

Change-Id: I783dd3b047547f588606ca7eb0fc60bb34357622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

28bc1640

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main · 55c8a818
Timothy Yiu authored 1 year ago

55c8a818

Merge "Fix null pointer risk on shouldSleepActivities." into main am: · 181f82ec

Wei Sheng Shih authored 1 year ago

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

Change-Id: Ib9f71da55c3b8488962592864db1a2da9951bd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

181f82ec

Merge "Re-enable ThinLTO for libandroid_runtime" into main am: · 0d670890

Yi Kong authored 1 year ago

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

Change-Id: If891c55458967e2e04cec78ad7d2e7c6c78844d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0d670890

Merge "Fix null pointer risk on shouldSleepActivities." into main · 30c3601a
Wei Sheng Shih authored 1 year ago

30c3601a
Merge "Re-enable ThinLTO for libandroid_runtime" into main · e09c2b6b
Yi Kong authored 1 year ago

e09c2b6b

Merge "Fix initialization of procState counters after a failed readSummary"... · 6ae5c917

Dmitri Plotnikov authored 1 year ago

Merge "Fix initialization of procState counters after a failed readSummary" into main am: 3e4b763f

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

Change-Id: I546229aa02db7ce599638cc78701027069497832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6ae5c917

Merge "Fix initialization of procState counters after a failed readSummary" into main · 3e4b763f
Dmitri Plotnikov authored 1 year ago

3e4b763f

Nov 27, 2023

[automerger skipped] Merge "Avoid including com.android.server.power.stats in... · c9bd342c

Dmitri Plotnikov authored 1 year ago

[automerger skipped] Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c -s ours

am skip reason: Merged-In Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2 with SHA-1 1814dffd is already in history

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



Change-Id: I0b3b4e4cccecd5763ae85a8c6861edc1b5e19302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c9bd342c

[automerger skipped] Avoid including com.android.server.power.stats in... · 5d5f9e28

Dmitri Plotnikov authored 1 year ago

[automerger skipped] Avoid including com.android.server.power.stats in presubmit twice am: 05c42154 -s ours

am skip reason: Merged-In Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2 with SHA-1 1814dffd is already in history

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



Change-Id: Id352f569d12528f26d5afc24476b45d5d7e5cbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5d5f9e28

Fix initialization of procState counters after a failed readSummary · 5e3ce0ed

Dmitri Plotnikov authored 1 year ago

The code before this change assumes that `mProcStateTimeMs`
and `mProcStateScreenOffTimeMs` are either both null or both non-null.
However, if during the readSummary operation one of the two counters
is read successfully while the other fails, we end up in
an inconsistent state.

Bug: 305894439
Test: atest PowerStatsTests
Change-Id: I7928031e78d742e196750a95f6a17795b4192530
Merged-In: I7928031e78d742e196750a95f6a17795b4192530

5e3ce0ed

Merge "Avoid including com.android.server.power.stats in presubmit twice" into main · 23e53c1c
Dmitri Plotnikov authored 1 year ago

23e53c1c

Avoid log spam for the common "no user keys" case. · a52fcec3

Elliott Hughes authored 1 year ago

We see this a lot in logs, and it causes a lot of people to hassle us
about what is actually a common case:
```
 AdbDebuggingManager: Cannot read user keys
 AdbDebuggingManager: java.io.FileNotFoundException: /data/misc/adb/adb_keys: open failed: ENOENT (No such file or directory)
 AdbDebuggingManager: 	at libcore.io.IoBridge.open(IoBridge.java:574)
 AdbDebuggingManager: 	at java.io.FileInputStream.<init>(FileInputStream.java:160)
 AdbDebuggingManager: 	at android.os.FileUtils.readTextFile(FileUtils.java:638)
 AdbDebuggingManager: 	at com.android.server.adb.AdbDebuggingManager.dump(AdbDebuggingManager.java:1801)
 AdbDebuggingManager: 	at com.android.server.adb.AdbService.dump(AdbService.java:604)
 AdbDebuggingManager: 	at android.os.Binder.doDump(Binder.java:1030)
 AdbDebuggingManager: 	at android.os.Binder.dump(Binder.java:1020)
 AdbDebuggingManager: 	at android.os.Binder.onTransact(Binder.java:890)
 AdbDebuggingManager: 	at android.debug.IAdbManager$Stub.onTransact(IAdbManager.java:357)
 AdbDebuggingManager: 	at android.os.Binder.execTransactInternal(Binder.java:1362)
 AdbDebuggingManager: 	at android.os.Binder.execTransact(Binder.java:1301)
 AdbDebuggingManager: Caused by: android.system.ErrnoException: open failed: ENOENT (No such file or directory)
 AdbDebuggingManager: 	at libcore.io.Linux.open(Native Method)
 AdbDebuggingManager: 	at libcore.io.ForwardingOs.open(ForwardingOs.java:563)
 AdbDebuggingManager: 	at libcore.io.BlockGuardOs.open(BlockGuardOs.java:274)
 AdbDebuggingManager: 	at libcore.io.IoBridge.open(IoBridge.java:560)
```

Test: treehugger
Change-Id: I5206f8dada0d97c022459c2370b839c209041539

a52fcec3

Avoid including com.android.server.power.stats in presubmit twice · 05c42154

Dmitri Plotnikov authored 1 year ago

Bug: 282715698
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1814dffd1c6f9edc0115ac73a434263321d77db9)
Merged-In: Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2
Change-Id: Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2

05c42154

Update exception thrown for keystore · 40a8d1f7

Shaquille Johnson authored 1 year ago

When the keystore service is not available or
not initialized we do not want to crash the service.
So we throw and Exception that KeystoreService
is not availble when it should be possibly in an
incorrect state.

Test: atest CtsKeystoreTestCases
Bug: 304758094
Change-Id: If73856deb27b9f11a9b77f0ba32c3b4037332759

40a8d1f7