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

Commit be3cafd4 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "add permission check for exported activity" into rvc-qpr-dev am: 11ed014e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65b25d86e6f2a21244f88699b0da537804a27cfc
parents 56afaf2c 11ed014e

packages/CarrierDefaultApp/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ 
            android:name="com.android.carrierdefaultapp.CaptivePortalLoginActivity"

            android:name="com.android.carrierdefaultapp.CaptivePortalLoginActivity"

            android:label="@string/action_bar_label"

            android:label="@string/action_bar_label"

            android:exported="true"

            android:exported="true"

            android:permission="android.permission.MODIFY_PHONE_STATE"

            android:theme="@style/AppTheme"

            android:theme="@style/AppTheme"

            android:configChanges="keyboardHidden|orientation|screenSize">

            android:configChanges="keyboardHidden|orientation|screenSize">

            <intent-filter>

            <intent-filter>