Dave Mankoff 962e9f5d7c [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 83a6d4fc67 -s ours am: db11069435 -s ours am: 35acb5d0b0 -s ours am: 7ba79a4ce5 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: I76a58d1dd04f233e7b57fa8d145b1257f7323ba4

2021-11-18 00:29:46 +00:00

.prebuilt_info

…

apct-tests/perftests

Merge "Add multi-task support to recents-animation task-appeared" into sc-v2-dev am: 35b8e2b997

2021-11-10 17:28:05 +00:00

apex

Merge "Add documentation for BlobStore service." am: 8aebd244de am: 51dcd40ff3 am: c22baf983c

2021-11-08 23:19:18 +00:00

api

…

boot

…

cmds

Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380

2021-11-09 18:07:18 +00:00

config

Merge "Remove obsolete files on preloaded classes."

2021-11-17 10:36:58 +00:00

core

Merge "Optimize parcelization protocol in RemoteViews and RemoteCollectionItems" into sc-v2-dev am: 742187b89d

2021-11-17 21:37:43 +00:00

data

Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920 am: fa2c7f2eb1

2021-11-17 20:18:16 +00:00

docs

…

drm

…

errorprone

…

graphics

Resolve merge conflicts of c2810b9385 to sc-qpr1-dev-plus-aosp

2021-11-04 17:52:05 +00:00

identity

…

keystore

…

libs

Merge "Revert "PiP: Recalculate size if too big/small on display change."" into sc-v2-dev am: 7b5857e2e3

2021-11-17 17:48:43 +00:00

location

…

lowpan

…

media

Merge "Fix EINTR handling" am: 7d0bdd39fd am: 80b29f8241 am: 10bfeb68f7

2021-11-16 20:34:48 +00:00

mime

…

mms

Update owners file

2021-11-08 22:02:15 -08:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

[DO NOT MERGE] Animate dialog stack and use in UserSwitcher am: 327d67cb2a

2021-11-17 18:22:07 +00:00

proto

Merge "Add letterboxInsets to TaskSnapshot" into sc-v2-dev am: 442ba5476d

2021-11-16 18:57:56 +00:00

rs

Migrate rs/jni to Soong

2021-11-04 14:44:07 +00:00

samples

…

sax

…

services

Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 am: 9966ff4bc5 am: 8d57a8c7b2

2021-11-17 22:53:19 +00:00

startop

…

telecomm

Merge "API docs clarification for placing calls." am: 57954552ad am: 043c9dee2d

2021-11-11 19:39:33 +00:00

telephony

Merge "Make KEY_VONR_SETTING_VISIBILITY_BOOL default to true" into sc-v2-dev am: 02183c88aa

2021-11-17 01:46:17 +00:00

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a am: 7e0aeb84b0 am: 0ae29439c6

2021-11-17 23:35:23 +00:00

tools

Merge "AAPT Files - Permit invariant filepaths for getting file names" am: 0ba2a37eaf am: c8b5598a14 am: b568a8202c am: 4b7dd9fced

2021-11-11 11:02:04 +00:00

wifi

…

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920 am: fa2c7f2eb1

2021-11-17 20:18:16 +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

…

PACKAGE_MANAGER_OWNERS

…

pathmap.mk

…

PREUPLOAD.cfg

…

ProtoLibraries.bp

…

StubLibraries.bp

Compile android-non-updatable with framework-tethering module-lib stub

2021-11-12 23:13:18 +08:00

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%