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

Commit 43412f0b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6643631 from 7387faf8 to rvc-release 

Change-Id: I9d364f21aad07e325e2a2a36443612cacf51333a
parents 8d8aa56f 7387faf8

core/java/android/companion/CompanionDeviceManager.java

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ public final class CompanionDeviceManager { 
    /**

     * A device, returned in the activity result of the {@link IntentSender} received in

     * {@link Callback#onDeviceFound}

     *

     * Type is:

     * <ul>

     *     <li>for classic Bluetooth - {@link android.bluetooth.BluetoothDevice}</li>

     *     <li>for Bluetooth LE - {@link android.bluetooth.le.ScanResult}</li>

     *     <li>for WiFi - {@link android.net.wifi.ScanResult}</li>

     * </ul>

     */

    public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";

core/java/com/android/internal/app/ResolverActivity.java

+10 −6
Original line number Diff line number Diff line
@@ -1279,6 +1279,9 @@ public class ResolverActivity extends Activity implements 
    }



    private void safelyStartActivityInternal(TargetInfo cti) {

        // If the target is suspended, the activity will not be successfully launched.

        // Do not unregister from package manager updates in this case

        if (!cti.isSuspended()) {

            if (mPersonalPackageMonitor != null) {

                mPersonalPackageMonitor.unregister();

            }
@@ -1286,6 +1289,7 @@ public class ResolverActivity extends Activity implements 
                mWorkPackageMonitor.unregister();

            }

            mRegistered = false;

        }

        // If needed, show that intent is forwarded

        // from managed profile to owner or other way around.

        if (mProfileSwitchMessageId != -1) {

core/res/res/anim/screen_rotate_180_enter.xml

+6 −0
Original line number Diff line number Diff line
@@ -25,4 +25,10 @@ 
        android:fillBefore="true" android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="@android:integer/config_screen_rotation_total_180" />

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true" android:fillAfter="true"

        android:interpolator="@interpolator/screen_rotation_alpha_in"

        android:startOffset="@android:integer/config_screen_rotation_fade_in_delay"

        android:duration="@android:integer/config_screen_rotation_fade_in" />

</set>

core/res/res/anim/screen_rotate_180_exit.xml

+6 −1
Original line number Diff line number Diff line
@@ -25,4 +25,9 @@ 
        android:fillBefore="true" android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="@android:integer/config_screen_rotation_total_180" />

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true" android:fillAfter="true"

        android:interpolator="@interpolator/screen_rotation_alpha_out"

        android:duration="@android:integer/config_screen_rotation_fade_out" />

</set>

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -424,6 +424,8 @@ applications that come with the platform 
        <permission name="android.permission.LOCATION_HARDWARE" />

        <!-- Permissions required for GTS test - GtsDialerAudioTestCases -->

        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />

        <!-- Permissions required for CTS test - AdbManagerTest -->

        <permission name="android.permission.MANAGE_DEBUGGING" />

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">