diff options
| author | 2020-08-06 13:10:00 +0000 | |
|---|---|---|
| committer | 2020-08-06 13:10:00 +0000 | |
| commit | 8d592fae4e2bbd7e1eb940dbf8d37b91c54a6a2c (patch) | |
| tree | 0abc5148688c156d4bf6b39e161f72b1d18ee326 | |
| parent | 5b908d36a394604d7be3fba76cfb38a1503829cd (diff) | |
| parent | a3d8ee34a421271bedd1d6ce5cc9c54e7b9eb56a (diff) | |
Merge "resolve merge conflicts of c94e810cabc04da9e7327ef002a678486d8e1f6f to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316526
Change-Id: I3de451092d7139bc0b19d4288967e9347a69908e
| -rw-r--r-- | config/hiddenapi-force-blocked.txt (renamed from config/hiddenapi-force-blacklist.txt) | 0 | ||||
| -rw-r--r-- | config/hiddenapi-max-target-o.txt (renamed from config/hiddenapi-greylist-max-o.txt) | 0 | ||||
| -rw-r--r-- | config/hiddenapi-max-target-p.txt (renamed from config/hiddenapi-greylist-max-p.txt) | 0 | ||||
| -rw-r--r-- | config/hiddenapi-max-target-q.txt (renamed from config/hiddenapi-greylist-max-q.txt) | 0 | ||||
| -rw-r--r-- | config/hiddenapi-unsupported-packages.txt (renamed from config/hiddenapi-greylist-packages.txt) | 0 | ||||
| -rw-r--r-- | config/hiddenapi-unsupported.txt (renamed from config/hiddenapi-greylist.txt) | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/config/hiddenapi-force-blacklist.txt b/config/hiddenapi-force-blocked.txt index b328f2ac1955..b328f2ac1955 100644 --- a/config/hiddenapi-force-blacklist.txt +++ b/config/hiddenapi-force-blocked.txt diff --git a/config/hiddenapi-greylist-max-o.txt b/config/hiddenapi-max-target-o.txt index 023bf3876228..023bf3876228 100644 --- a/config/hiddenapi-greylist-max-o.txt +++ b/config/hiddenapi-max-target-o.txt diff --git a/config/hiddenapi-greylist-max-p.txt b/config/hiddenapi-max-target-p.txt index 351e71dd9538..351e71dd9538 100644 --- a/config/hiddenapi-greylist-max-p.txt +++ b/config/hiddenapi-max-target-p.txt diff --git a/config/hiddenapi-greylist-max-q.txt b/config/hiddenapi-max-target-q.txt index 4832dd184ec5..4832dd184ec5 100644 --- a/config/hiddenapi-greylist-max-q.txt +++ b/config/hiddenapi-max-target-q.txt diff --git a/config/hiddenapi-greylist-packages.txt b/config/hiddenapi-unsupported-packages.txt index 986d2591a007..986d2591a007 100644 --- a/config/hiddenapi-greylist-packages.txt +++ b/config/hiddenapi-unsupported-packages.txt diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-unsupported.txt index a3543dc7f4ee..a3543dc7f4ee 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-unsupported.txt |