Commits · cb54be526f420c2ca5eb74642c38aa147ff07a98 · Dhina17 / platform_frameworks_base

* 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... · 71a5c1c0

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: 98cbec1d -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: Ic320842daed006628adfc894df3c2b4c914ce647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

71a5c1c0

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

Prabir Pradhan authored 1 year ago

[automerger skipped] Remove HID usage mapping for stylus buttons in Generic.kl am: 2c42929c -s ours am: c01e4c7d -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: I521fe1341b5b0f363aa482a3f7252e050d16f4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b5e46b81

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

Prabir Pradhan authored 1 year ago

[automerger skipped] Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into main am: 3a25f1cc am: f1d23f9a -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: I8db30fb8a2915383acc6a175ca1ce83e7342da0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

84e1c371

[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 am: · f1d23f9a

Prabir Pradhan authored 1 year ago

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

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

f1d23f9a

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:... · 478bbc77

Munikrishna J authored 1 year ago

Merge "Update docstring for iwlan supported new ike transforms" into main am: 6633e9b7 am: 13821e97

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

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

478bbc77

Merge "Update docstring for iwlan supported new ike transforms" into main am:... · d60d005b

Munikrishna J authored 1 year ago

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

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

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

d60d005b

Merge "Update docstring for iwlan supported new ike transforms" into main am: · 13821e97

Munikrishna J authored 1 year ago

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

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

13821e97

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: am: · 3dcc224c

Anton Hansson authored 1 year ago

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

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

3dcc224c

Merge "Migrate droidstubs/droiddoc to flags" into main am: am: · 5b208744

Anton Hansson authored 1 year ago

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

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

5b208744

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

Anton Hansson authored 1 year ago

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

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

b3c57552

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: am: · 203377e6

Kangping Dong authored 1 year ago

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

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

203377e6

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

Kangping Dong authored 1 year ago

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

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

1ff7e3ba

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

Kangping Dong authored 1 year ago

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

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

32cb275b

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: am: · 5265e4bd

Kangping Dong authored 1 year ago

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

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

5265e4bd

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

Kangping Dong authored 1 year ago

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

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

7819abd9

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

Kangping Dong authored 1 year ago

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

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

de34f1c3

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

Merge "Add phone call uid to SchedulerPolicyService to permit the priority... · db6c5d36

Avinash Malipatil authored 1 year ago

Merge "Add phone call uid to SchedulerPolicyService to permit the priority change" into udc-qpr-dev am: 4c6327c8

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

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

db6c5d36

Merge "Add phone call uid to SchedulerPolicyService to permit the priority change" into udc-qpr-dev · 4c6327c8
Avinash Malipatil authored 1 year ago

4c6327c8

Oct 24, 2023

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