This reverts commit 7917bcd9.

Reason for revert: <b/285619939>

Change-Id: I057a43d5bf64ad602d822991ad1a688aee5f2bc7
Merged-In: I057a43d5bf64ad602d822991ad1a688aee5f2bc7
(cherry picked from commit 07596e3f)
(cherry picked from commit 65f2c18d)

Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future

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



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

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



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

* changes:
  Guard the death recipient behavior behind a build flag
  binder: fix death recipient leak for apps targeting >= V

Bug: 284266229
Change-Id: Ic0453611147ca1a327a150f0ffc92b9cd60b86b1

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



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

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



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

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



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

* changes:
  Add api_surface prop to non-updatable droidstubs
  Replace api_files prop to api_contributions
  Remove non-updatable contribution from android_test_stubs_current_contributions

The death recipient behavior introduced with Ibb371f4de45530670d5f783f8ead8404c39381b4
is guarded with a build flag
RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.

Bug: 298374304
Test: build
Change-Id: Ie604ee723385676cf3c83f0d9b2a46ceb322903a

Before this change, when a death recipient is set on a binder proxy via
linkToDeath, a JNI global ref to the recipient object was created. That
global ref is cleared only when unlinkToDeath is explicitly called or
binderDied is notified.

In addition, since binderDied didn't give the IBinder which has died,
people has kept a strong reference to IBinder in the death recipient
object. Ex:

class FooHolder implements Binder.DeathRecipient {
    private IFoo mFoo;
    public FooHolder(IFoo foo) {
        mFoo = foo; // this!!!
        mFoo.linkToDeath(this, 0);
    }
    @Override
    public void binderDied() {
        // know that IFoo has died
    }
}

Unfortunately, this is prone to leak. Even if there's no reference to
FooHolder in your program, it is kept in memory due to the JNI global
ref as mentioned above. It means that you keep IFoo as well, and that
in turn keeps the binder service in the remote side. As a result,
binderDied will never be called (well, except when the server process
crashes).

The only way to release this object is calling unlinkToDeath explicitly
when you drop references to FooHolder. However, it's error prone and
keeping that practice is hard to be enforced.

Recently, the need for this pattern has become weaker as we introduced
binderDied(IBinder who). However, the API is quite new and its use is
not mandated. There still are many cases where this pattern is used.

This change is an attempt to fix the issue without having to touch the
existing uses. The idea is to change the way that death recipient
objects are strongly referenced - depending on whether you are targeting
Android V+ or not.

If targeting Android V+, the death recipient object is "weakly"
referenced from JNI. Instead, it is "strongly" referenced from the
BinderProxy object it is registered at. This means that if you drop
a BinderProxy object, you are dropping its death recipients as well,
unless you keep references to the recipients separately.

For apps targeting pre-V versions, we keep the JNI strong reference.

An important implication of this is that you won't get binderDied if you
drop BinderProxy object before the binder actually dies. This actually
is the documented behavior and has been the actual behavior "if you
don't use the FooHolder pattern mentioned above". I'd argue that this CL
fixes the undocumented incorrect behavior. However, we should be
conservative when making any behavioral change, thus we are hiding this
change behind the target SDK level.

Bug: 298374304
Test: atest BinderLeakTest BinderLeakTest_legacy

Change-Id: Ibb371f4de45530670d5f783f8ead8404c39381b4

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



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

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



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

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



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

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



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

Bug: 282058146
Test: Treehugger
Merged-In: Idd66455b28cc61e53c68f559244ad2d022cf65d3
Change-Id: Iaa956dec6c64220bcd3a83390b4a9811c42e518e

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



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

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



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

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



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

Use null class loader to fuzz readParcelable.

Bug: 301519740
Test: m java_binder_parcel_fuzzer && ./jazzer_helper.sh --fuzz_target
      java_binder_parcel_fuzzer --target_class parcelfuzzer.ParcelFuzzer
Change-Id: Ieeff3cf9ea5734441d417d16691d7ca9b708c5b3

Commit df4cd065 updated how command line arguments are parsed. However,
sys.argv[0] should be ignored (as this is the name of the program).
Remove the argument, so the default value (sys.argv[1:]) is used.

Also, use the embedded_launcher so that the help renders
as:
    usage: lint_fix [-h]
instead of:
    usage: usage: __soong_entrypoint_redirector__.py [-h]

Test: lint_fix --print --no-fix --check AnnotatedAidlCounter \
       --lint-module AndroidUtilsLintChecker services.autofill
Change-Id: I00e3e3b70c9715e363d3448ae84bf9ff161f2306

All droidstubs created from sdk_library possess api_surface information,
while the non-updatable droidstubs do not define this property. This
change defines api_surface for non-updatable droidstubs so that the
information can be used in java_api_library

Test: m nothing
Bug: 301321012
Change-Id: I6c08003bb8c366f331440e52bbde776999fd6c94

Bug: 299498652
Test: Manually tested using CtsPermissionsSyncTestApp
Change-Id: I55adf01a4b303c04ff04b94ab00045abccf42273

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



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

Bug: 284266229
Test: presubmit
Flag: none
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f00d54005df32200eaf8c7eaaa95bba266bda8dc)
Merged-In: Ie7f7d334a4904bfbb19baa5dc814291828a8c9eb
Change-Id: Ie7f7d334a4904bfbb19baa5dc814291828a8c9eb

The auto-generated Flags.FLAG_NAME constants are difficult to review in
API tracking files. metalava will expand annotation arguments if

  (1) the field declaration is known to metalava, and
  (2) the constant is not part of the API surface.

The auto-generated constants are hidden, so not part of any API surface.
This satisfies (1).

This CL adds the auto-generated sources to metalava's input. This
satisfies (2).

(cherry picked from commit 01544b94)

Bug: 297881670
Test: m checkapi
Test: m <partition>/etc/aconfig_flags.textproto & diff against a clean build
Merged-In: I757c6e87d81768ef6095a4bea67c74c3ae6028a7
Change-Id: I757c6e87d81768ef6095a4bea67c74c3ae6028a7

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



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

This change was already submitted with
https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22
but was never propagated to downstream.

Test: m nothing --build-from-text-stub
Merged-In: I479ec3b1554dcc6630207c5f095c6f9d211b035b
Change-Id: I4f7ea80608945d3d1840751e25fa7b0f92c119b8