Matt Pietal 7c4da0ebf1 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-09-19 20:44:27 +00:00

.prebuilt_info

…

apct-tests/perftests

…

apex

Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7

2022-07-20 01:39:37 +00:00

api

…

boot

…

cmds

Revert "Disable pointer authentication in app processes."

2022-03-16 02:35:10 +00:00

config

…

core

[automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559

2022-09-01 18:52:10 +00:00

data

[SC][RESTRICT AUTOMERGE]Update telemetry service permission name in allowlists

2022-03-20 18:26:01 -07:00

docs

…

drm

…

errorprone

…

graphics

SurfaceView: Synchronize initial destframe change from BBQ

2021-12-14 19:34:02 +00:00

identity

…

keystore

…

libs

Import translations. DO NOT MERGE ANYWHERE

2022-05-08 17:27:45 +00:00

location

…

lowpan

…

media

AudioService: dump routing cache in AudioSystemAdapter

2022-01-10 19:10:35 -08:00

mime

…

mms

…

native

DO NOT MERGE: Track SurfaceComposerClient changes

2022-01-02 21:55:41 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock

2022-09-14 15:51:31 +00:00

proto

…

rs

…

samples

…

sax

…

services

[pm] forbid deletion of protected packages

2022-09-13 18:09:22 +00:00

startop

…

telecomm

Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4

2022-08-10 20:10:22 +00:00

telephony

[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce

2022-05-12 16:09:09 +00:00

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

Add type string to VCN NetworkAgentConfig

2022-02-16 21:47:33 +00:00

tools

…

wifi

…

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

Merge "SurfaceControl: Add setDropInputMode api" into rvc-dev am: 5aa3d21693

2022-02-16 19:34:31 +00:00

Android.mk

…

ApiDocs.bp

…

BATTERY_STATS_OWNERS

…

CleanSpec.mk

…

framework-jarjar-rules.txt

…

METADATA

…

MODULE_LICENSE_APACHE2

…

MULTIUSER_OWNERS

…

NOTICE

…

OWNERS

…

OWNERS.md

…

pathmap.mk

…

PREUPLOAD.cfg

…

ProtoLibraries.bp

…

StubLibraries.bp

…

TEST_MAPPING

…

TestProtoLibraries.bp

…

ZYGOTE_OWNERS

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%