Commits · 523dcae7c001c4019581ec7d012a24dc17f9e8d6 · Dhina17 / platform_frameworks_base

Oct 25, 2023

Merge "Camera: Fix OutputConfiguration equality check" into main am: · 523dcae7

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

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

523dcae7

Merge "Camera: Fix OutputConfiguration equality check" into main · 04e59b17
Treehugger Robot authored 1 year ago

04e59b17

Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am: · de2f11c6

Eric Biggers authored 1 year ago

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

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

de2f11c6

Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main · c410ea7a
Eric Biggers authored 1 year ago

c410ea7a

Merge "Update owners files" into main am: · ec7a5104

Eghosa Ewansiha-Vlachavas authored 1 year ago

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

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

ec7a5104

Merge "Update owners files" into main · b3ac3137
Eghosa Ewansiha-Vlachavas authored 1 year ago

b3ac3137

Merge "Update owner for package.proto" into main am: · a5909383

Song Chun Fan authored 1 year ago

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

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

a5909383

Merge changes from topic "user-key-rename" into main am: · bf42e62c

Eric Biggers authored 1 year ago

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

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

bf42e62c

Merge "Update owner for package.proto" into main · 5637e41d
Song Chun Fan authored 1 year ago

5637e41d

Merge changes from topic "user-key-rename" into main · 7490fc59

Eric Biggers authored 1 year ago

* changes:
  Use isCeStorageUnlocked() in StrictMode.java
  Rename methods for creating and destroying user's storage keys
  Rename methods for unlocking, locking, and protecting CE storage

7490fc59

[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in... · 98cbec1d

Prabir Pradhan authored 1 year ago

[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into main am: 3a25f1cc -s ours

am skip reason: Merged-In I580514bdcbbfbe93df83fa3faa6262077e881243 with SHA-1 9982f544 is already in history

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



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

98cbec1d

[automerger skipped] Remove HID usage mapping for stylus buttons in Generic.kl... · c01e4c7d

Prabir Pradhan authored 1 year ago

[automerger skipped] Remove HID usage mapping for stylus buttons in Generic.kl am: 2c42929c -s ours

am skip reason: Merged-In I580514bdcbbfbe93df83fa3faa6262077e881243 with SHA-1 9982f544 is already in history

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



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

c01e4c7d

Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into main · 3a25f1cc
Prabir Pradhan authored 1 year ago

3a25f1cc

Merge "Update docstring for iwlan supported new ike transforms" into main am: · 2125c830

Munikrishna J authored 1 year ago

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

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

2125c830

Merge "Update docstring for iwlan supported new ike transforms" into main · 6633e9b7
Munikrishna J authored 1 year ago

6633e9b7

Merge "Migrate droidstubs/droiddoc to flags" into main am: · 58b1862d

Anton Hansson authored 1 year ago

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

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

58b1862d

Merge "Migrate droidstubs/droiddoc to flags" into main · 5e416bb8
Anton Hansson authored 1 year ago

5e416bb8

Merge "[Thread] flagging the THREAD_NETWORK_SERVICE API" into main am: · c567a23d

Kangping Dong authored 1 year ago

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

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

c567a23d

Merge "[Thread] flagging the THREAD_NETWORK_SERVICE API" into main · 55722bf5
Kangping Dong authored 1 year ago

55722bf5

Merge "[Thread] flagging the FEATURE_THREAD_NETWORK API" into main am: · d5554ffe

Kangping Dong authored 1 year ago

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

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

d5554ffe

Merge "[Thread] flagging the FEATURE_THREAD_NETWORK API" into main · e4c42b34
Kangping Dong authored 1 year ago

e4c42b34

Oct 24, 2023

Improve documentation for unlockUserKeyIfUnsecured() · 912e35b6

Eric Biggers authored 1 year ago

Document more clearly what unlockUserKeyIfUnsecured() actually does.  It
probably should be renamed to something clearer (I'm thinking of just
changing "Key" to "Keys"), but this is a start.

Bug: 306204742
Flag: exempt, comment-only change
Test: presubmit
Change-Id: Ib35a62fb4627db5755fac57609b1fbb3a659492d

912e35b6

Use isCeStorageUnlocked() in StrictMode.java · 132300bd

Eric Biggers authored 1 year ago

isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it
clear what it does (considering that there are many types of user keys).
Change StrictMode.java to use the new name.  No change in behavior.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I4616b55cc4a088cfd396cc1b4ad60f3ecfed942b

132300bd

Rename methods for creating and destroying user's storage keys · de2637e2

Eric Biggers authored 1 year ago

Users have many cryptographic keys, such as:

- Storage (file-based encryption) keys, both CE and DE
- Keystore super keys, both AfterFirstUnlock and UnlockedDeviceRequired
- Keystore client keys
- Synthetic password and the Keystore key that encrypts it

Unfortunately, many StorageManager, vold, and LockSettingsService
methods refer simply to "UserKey".  It isn't clear or consistent which
key(s) they mean.  For example, unlockUserKey unlocks CE storage,
createUserKey creates both the CE and DE keys, and
unlockUserKeyIfUnsecured unlocks CE storage but also does other things.
With the planned fixes to handle Keystore super keys more similarly to
the CE storage key (b/296464083), this confusion will increase further.

This CL is the second part of fixing this.  It renames the following
methods of StorageManager to make it clearer what they do:

   createUserKey => createUserStorageKeys
   destroyUserKey => destroyUserStorageKeys

No change in behavior, except a changed trace tag name and log message.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I5894beb97823dced5954e405d779fada49c79e8d

de2637e2

Rename methods for unlocking, locking, and protecting CE storage · aaec88c7

Eric Biggers authored 1 year ago

Users have many cryptographic keys, such as:

- Storage (file-based encryption) keys, both CE and DE
- Keystore super keys, both AfterFirstUnlock and UnlockedDeviceRequired
- Keystore client keys
- Synthetic password and the Keystore key that encrypts it

Unfortunately, many StorageManager, vold, and LockSettingsService
methods refer simply to "UserKey".  It isn't clear or consistent which
key(s) they mean.  For example, unlockUserKey unlocks CE storage,
createUserKey creates both the CE and DE keys, and
unlockUserKeyIfUnsecured unlocks CE storage but also does other things.
With the planned fixes to handle Keystore super keys more similarly to
the CE storage key (b/296464083), this confusion will increase further.

This CL is the first part of fixing this.  It renames the following
StorageManager methods to make it clear that they deal with CE storage:

   unlockUserKey => unlockCeStorage
   lockUserKey => lockCeStorage
   setUserKeyProtection => setCeStorageProtection

In addition, it starts the renaming of:

   isUserKeyUnlocked => isCeStorageUnlocked

However, isUserKeyUnlocked is used more widely and is also a @TestApi,
so for now it still exists alongside the new name.  Later CLs will
convert the remaining callers of isUserKeyUnlocked to use the new name.

No change in behavior except for some changed log messages.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I202ebbfd2b4f79fedb3ed120a8ad81500c126894

aaec88c7

Remove HID usage mapping for stylus buttons in Generic.kl · 2c42929c

Prabir Pradhan authored 1 year ago

... until we figure out a way to determine if a device supports a
specific HID usage code. Right now, having a usage code mapping means we
automatically assume the device can report the key code. Assuming a
device can support a stylus keycode makes the device get classified as a
stylus, leading to widespread misclassifications.

Bug: 291529805
Test: atest inputflinger_tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5fb192aaec7a1d4ebb1384d96b3f79d4b2ca2f2c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:55930e07d69fbd8ffd27d677a06fd0ba71a30bf8)
Merged-In: I580514bdcbbfbe93df83fa3faa6262077e881243
Change-Id: I580514bdcbbfbe93df83fa3faa6262077e881243

2c42929c

Merge "usermanager(api): Flag nfc user restriction added for Android V" into main am: · a6309ee5

Treehugger Robot authored 1 year ago

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

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

a6309ee5

Merge "usermanager(api): Flag nfc user restriction added for Android V" into main · 98dc75f3
Treehugger Robot authored 1 year ago

98dc75f3
[Thread] flagging the THREAD_NETWORK_SERVICE API · bb87a05a
Kangping Dong authored 1 year ago
```
Bug: 304478648
Test: build
Change-Id: I4c102131c9f1639d894b95114c76028808b64c2f
```
bb87a05a

Merge "Remove libbluetooth-binder-aidl from framework-minus-apex-defaults" into main am: · 8be5513c

David Duarte authored 1 year ago

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

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

8be5513c

Merge "m framework-minus-apex should not build services" into main am: · 4339e6cc

Anton Hansson authored 1 year ago

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

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

4339e6cc

Merge "Remove libbluetooth-binder-aidl from framework-minus-apex-defaults" into main · ca0bc935
David Duarte authored 1 year ago

ca0bc935
Merge "m framework-minus-apex should not build services" into main · 13c1831f
Anton Hansson authored 1 year ago

13c1831f

Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: · eb66a485

Roshan Pius authored 1 year ago

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

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

eb66a485

Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main · 1d987050
Roshan Pius authored 1 year ago

1d987050

Merge "Created empty framework-location non-updatable module" into main am: · f3dda786

Anton Hansson authored 1 year ago

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

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

f3dda786

Merge "Created empty framework-location non-updatable module" into main · b0a5dffa
Anton Hansson authored 1 year ago

b0a5dffa

Merge "SdkTestCore for non-updatable modules" into main am: · 316dbb7c

Anton Hansson authored 1 year ago

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

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

316dbb7c

Merge "SdkTestCore for non-updatable modules" into main · a81ea29d
Anton Hansson authored 1 year ago

a81ea29d

[Thread] flagging the FEATURE_THREAD_NETWORK API · 8348b90b

Kangping Dong authored 1 year ago

This commit annotates the PackageManager#FEATURE_THREAD_NETWORK API with the
"com.android.net.thread.flags.thread_enabled" flag.

Bug: 303726779
Test: build
Change-Id: I09a27a71b2beab7902bf29b44fb9c36cc3ce2f20

8348b90b