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

Commit 475d2780 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR1

Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
parents 57a7978f 54ee717d
Loading
Loading
Loading
Loading
+24 −9
Original line number Diff line number Diff line
@@ -274,10 +274,6 @@
                <action android:name="android.settings.WIFI_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter android:priority="1">
                <action android:name="android.intent.action.MAIN" />
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.wifi.WifiSettings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -297,7 +293,7 @@

        <activity
            android:name="Settings$NetworkProviderSettingsActivity"
            android:label="@string/network_dashboard_title"
            android:label="@string/provider_internet_settings"
            android:icon="@drawable/ic_homepage_network"
            android:exported="true"
            android:configChanges="orientation|keyboardHidden|screenSize">
@@ -315,6 +311,26 @@
                android:value="true" />
        </activity>

        <activity
            android:name="Settings$WifiDetailsSettingsActivity"
            android:label="@string/wifi_details_title"
            android:icon="@drawable/ic_homepage_network"
            android:exported="true"
            android:permission="android.permission.CHANGE_WIFI_STATE"
            android:configChanges="orientation|keyboardHidden|screenSize">
            <!-- The intent action is only public to OEM, because a special library is required. -->
            <intent-filter android:priority="1">
                <action android:name="android.settings.WIFI_DETAILS_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data
                android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.wifi.details.WifiNetworkDetailsFragment" />
            <meta-data
                android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>

        <activity
            android:name=".wifi.WifiPickerActivity"
            android:exported="true">
@@ -2195,6 +2211,8 @@
        <activity android:name=".development.AppPicker"
                  android:label="@string/select_application" />

        <activity android:name=".development.AdbQrCodeActivity" />

        <activity android:name=".development.DSULoader"
                  android:label="Select DSU Package"
                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
@@ -2225,6 +2243,7 @@
        </activity>

        <activity android:name=".bluetooth.BluetoothPairingDialog"
                  android:permission="android.permission.BLUETOOTH_PRIVILEGED"
                  android:excludeFromRecents="true"
                  android:windowSoftInputMode="stateVisible|adjustResize"
                  android:theme="@style/Theme.AlertDialog"
@@ -2988,10 +3007,6 @@
            </intent-filter>
        </activity>

        <!--
            The Wi-Fi result data will only be returned from WifiDialogActivity if the calling
            package has ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission. (see b/185126813)
        -->
        <activity
            android:name=".wifi.WifiDialogActivity"
            android:label=""
−1.2 MiB
Loading image diff...
+1.03 MiB
Loading image diff...
+1.04 MiB
Loading image diff...
+240 KiB
Loading image diff...
Loading