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

Unverified Commit 5baf8763 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r46' into staging/lineage-15.1_merge-android-8.1.0_r46 

Android 8.1.0 Release 46 (OPM6.171019.030.K1)

* tag 'android-8.1.0_r46':
  Import translations. DO NOT MERGE
  Delete obsolete activity alias for dev settings
  DO NOT MERGE Give PBAP permission only after user confirms

Change-Id: Ib08b0ed62e2615ab8150bdca3e93fa9f32df8478
parents 80ba99f2 0873eb7b

AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -2009,15 +2009,6 @@ 
                android:value="com.android.settings.print.PrintJobSettingsFragment" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="DevelopmentSettings"

                  android:exported="true"

                  android:label="@string/development_settings_title"

                  android:targetActivity="Settings$DevelopmentSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.development.DevelopmentSettings" />

        </activity-alias>



        <activity android:name=".development.AppPicker"

                  android:label="@string/select_application"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />