Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30a10970 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10360508 from 1f23d6ff to udc-release

Change-Id: Ic94f2b312435de5894b96fdbe863721dc3c6ed77
parents 5a54ea0a 1f23d6ff
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -348,6 +348,10 @@ public final class SmartspaceAction implements Parcelable {
         */
        @NonNull
        public SmartspaceAction build() {
            if (mIcon != null) {
                mIcon.convertToAshmem();
            }

            return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,
                    mPendingIntent, mIntent, mUserHandle, mExtras);
        }
+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public final class Icon implements Parcelable {
         */
        @NonNull
        public Icon build() {
            mIcon.convertToAshmem();
            return new Icon(mIcon, mContentDescription, mShouldTint);
        }
    }
+2 −2
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ public abstract class Context {
     * If binding from a top app and its target SDK version is at or above
     * {@link android.os.Build.VERSION_CODES#R}, the app needs to
     * explicitly use BIND_INCLUDE_CAPABILITIES flag to pass all capabilities to the service so the
     * other app can have while-use-use access such as location, camera, microphone from background.
     * other app can have while-in-use access such as location, camera, microphone from background.
     * If binding from a top app and its target SDK version is below
     * {@link android.os.Build.VERSION_CODES#R}, BIND_INCLUDE_CAPABILITIES is implicit.
     */
@@ -678,7 +678,7 @@ public abstract class Context {
     * </p>
     *
     * <em>This flag is NOT compatible with {@link BindServiceFlags}. If you need to use
     * {@link BindServiceFlags}, you must use {@link #BIND_EXTERNAL_SERVICE_LONG} instead.
     * {@link BindServiceFlags}, you must use {@link #BIND_EXTERNAL_SERVICE_LONG} instead.</em>
     */
    public static final int BIND_EXTERNAL_SERVICE = 0x80000000;

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public final class TotalCaptureResult extends CaptureResult {
     * @return unmodifiable map between physical camera ids and their capture result metadata
     *
     * @deprecated
     * <p>Please use {@link #getPhysicalCameraTotalResults() instead to get the
     * <p>Please use {@link #getPhysicalCameraTotalResults()} instead to get the
     * physical cameras' {@code TotalCaptureResult}.</p>
     */
    public Map<String, CaptureResult> getPhysicalCameraResults() {
+1 −0
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ public final class NfcAdapter {
                /* Stale sService pointer */
                if (sIsInitialized) sIsInitialized = false;
            }
            return null;
        }
        /* Try to initialize the service */
        NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
Loading