- Dec 13, 2023
-
-
Shuzhen Wang authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25631211 Change-Id: I438e932222136052299a1b09a057c2f599b113a9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shuzhen Wang authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25631211 Change-Id: Ie98291ecf031a6d556dadb76942632caf88d41e5 Signed-off-by:
-
Vova Sharaienko authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2542190 Change-Id: I6445344875fdf83b854cc7c444e596e129d9fdc6 Signed-off-by:
-
Shuzhen Wang authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25631211 Change-Id: I27914d88ae21ffa8642cea5cbc207c369ab7165e Signed-off-by:
-
Vova Sharaienko authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2542190 Change-Id: I04d909f8a6decf2fa17ac6e4c04a9a4387c94303 Signed-off-by:
-
Eric Biggers authored
Merge "Don't show "unified challenge" for profile with non-shareable credential" into main am: 2b021a27 am: 12caa8bf Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873078 Change-Id: Ibed0fe709349b7c6c5b5cbc7f618d4cb1bfb9660 Signed-off-by:
-
Eric Biggers authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871534 Change-Id: I4333aa5f9986029dd9e91550ac10bbfd83d809fb Signed-off-by:
-
Eric Biggers authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871508 Change-Id: I3d660b8673ca0ec8d376bcdc76484763d1a7dd32 Signed-off-by:
-
Eric Biggers authored
Merge "Fix bad merge resolution in LockSettingsService.java" into main am: 29a22951 am: cdf313d7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871537 Change-Id: I4544e9bddd9009e05756bf89ec3ed53ad6cc6e1e Signed-off-by:
-
Vova Sharaienko authored
-
Eric Biggers authored
Merge "Don't show "unified challenge" for profile with non-shareable credential" into main am: 2b021a27 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873078 Change-Id: Ide0d26467f69b81f4bed35492a9b75a8a3d14b6c Signed-off-by:
-
Eric Biggers authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871534 Change-Id: I6ac163ac35cd761003d29bbea67795c6abdf91f0 Signed-off-by:
-
Eric Biggers authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871508 Change-Id: I09431365f49d72fad8d0b755de3026de5f6380df Signed-off-by:
-
Eric Biggers authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871537 Change-Id: Iad47f2a9343697ca5de1b5635d5ca427820766ee Signed-off-by:
-
Eric Biggers authored
-
Eric Biggers authored
* changes: locksettings: clean up references to managed profiles Sync tieProfileLockIfNecessary() with internal main
-
Eric Biggers authored
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2869567 Change-Id: Id89655acd599f0117fb5bd75c1b2e675dbe97fa0 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2869567 Change-Id: I6e4aee4a4eb1070bc10743a402b26e421a640f54 Signed-off-by:
-
Treehugger Robot authored
-
Eric Biggers authored
The terms "unified challenge" and "separate challenge" apply only in the context of a profile whose credential is shareable with its parent. It is possible for a profile's credential to not be shareable with its parent. Update TrustManagerService's dump method to not show "profile with unified challenge" for such profiles. To make this possible, also add a new method LockPatternUtils#isProfileWithUnifiedChallenge(). Bug: 296464083 Test: dumpsys trust Flag: exempt, just changes dumpsys Change-Id: I52a5c68633b3be969863c10cd1740f700af9cc07
-
Hans Boehm authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2869329 Change-Id: I1177e136e08e3d05ec00a8ee7f7390d29c35637e Signed-off-by:
-
Hans Boehm authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2869329 Change-Id: Iba16f2189e22bda0ce924d6b1da328971fc64df9 Signed-off-by:
-
Hans Boehm authored
-
Shaju Mathew authored
Test: Treehugger Change-Id: I432ad0335f97604b9ca01a7fbbea541534badc27
-
- Dec 12, 2023
-
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871085 Change-Id: I5fa3b00c796c03b9d871ea562e6e49fd05b51baf Signed-off-by:
-
Eric Biggers authored
Clean up some code (comments, method names, class names) in LockSettingsService that referred to managed profiles (or work profiles, which are the same thing as managed profiles), when they really meant any profile with unified challenge. Originally only managed profiles supported unified challenge, so this code was fine originally. But now "clone profiles" support unified challenge too. There's also a plan to add another profile type that supports unified challenge. Bug: 214355283 Test: atest com.android.server.locksettings Flag: exempt, mechanical refactoring Change-Id: Ica472482983de13a19fcd9da966273e8d2e974ad
-
Eric Biggers authored
The internal-first commit ab75d2ce (http://ag/23150174) modified tieProfileLockIfNecessary(), which is now causing conflicts. As the modification to tieProfileLockIfNecessary() (which simply made it not crash when called with a profile that does not have a parent) does not depend on the rest of the change, cherry-pick it separately. Test: atest com.android.server.locksettings Merged-In: Ib0e4e52c10f0e95913ddfde606d6995de3538f27 Change-Id: I323811363d8801d4f0bc84f241ad042f45bb3358
-
Eric Biggers authored
The merge commit 8a5dadb7 (http://ag/25090532) duplicated the line 'mLockSettingsService.deleteRepairModePersistentDataIfNeeded();'. Fix this to make AOSP main match internal main. Test: atest com.android.server.locksettings Change-Id: I8e4326c33b715bc6a1fef7dbf6ce53cd69c1b93a
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871085 Change-Id: I4175cd552d4cede410781c499ed55dc51f1ead93 Signed-off-by:
-
Shunkai Yao authored
-
Shunkai Yao authored
Revert submission 2862771-cuttlefish_aidl_audio-2 Reason for revert: b/316027906 Reverted changes: /q/submissionid:2862771-cuttlefish_aidl_audio-2 Change-Id: I8809260bab6efb1d7f4fb31c55b6f4380b1d2df2
-
Mikhail Naganov authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862771 Change-Id: I7a2bdc179b5d4bd5145f1a10e7e8fa4a25b87361 Signed-off-by:
-
Victor Hsieh authored
Merge "Add OWNERS for core/java/android/service/persistentdata" into main am: 9fc2cd58 am: 65054f33 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865734 Change-Id: I24b141747d359cf1377bdb32483901fa5e8645c8 Signed-off-by:
-
Hans Boehm authored
Clear the buffer again whenever we have to reconnect. It's unclear this matters in normal operation, but this precludes some failure modes. Check poll() for an error return like ENOMEM. Bug: 315482121 Test: Treehugger Change-Id: I67fb6d73bde6a8f54ce297e5269641abea48b9b0
-
Mikhail Naganov authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862771 Change-Id: I17c15a12a16ef124fa6a70d9c9d13f16ebb1b1b7 Signed-off-by:
-
Victor Hsieh authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865734 Change-Id: I8697b4c1ac79f66fa839940dcc41054df2f6ecee Signed-off-by:
-
Mikhail Naganov authored
-
Victor Hsieh authored
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871194 Change-Id: I6b91eb522d1c9e43f6c33fe9dab73b522358f603 Signed-off-by:
-
