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

Commit c965f9d1 authored by Hai Zhang's avatar Hai Zhang
Browse files

Use a trampoline activity to ensure only exposed to settings search. 

Otherwise the intent action may not be verified.

Bug: 124452117
Bug: 128008577
Test: manual
Change-Id: I0445453700b5fa9b6837cd19682d2b1b03385ebf
parent 503d6227

AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -102,14 +102,16 @@ 
            </intent-filter>

        </activity>



        <activity-alias android:targetActivity="com.android.packageinstaller.permission.ui.ManagePermissionsActivity"

                  android:name="om.android.packageinstaller.permission.ManagePermissionsActivityTrampoline">

        <activity android:name="com.android.packageinstaller.permission.ui.ManagePermissionsActivityTrampoline"

                  android:excludeFromRecents="true"

                  android:noHistory="true"

                  android:theme="@android:style/Theme.NoDisplay">

            <intent-filter android:priority="1">

                <action android:name="com.android.permissioncontroller.settingssearch.action.MANAGE_PERMISSION_APPS" />

                <action android:name="com.android.permissioncontroller.settingssearch.action.REVIEW_PERMISSION_USAGE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity-alias>

        </activity>



        <activity android:name="com.android.packageinstaller.permission.ui.AppPermissionActivity"

                  android:configChanges="orientation|keyboardHidden|screenSize"

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java

+2 −21
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ package com.android.packageinstaller.permission.ui; 


import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static com.android.packageinstaller.permission.service.PermissionSearchIndexablesProvider.getOriginalKey;

import static com.android.packageinstaller.permission.service.PermissionSearchIndexablesProvider.isIntentValid;



import android.content.Intent;

import android.os.Bundle;

import android.os.UserHandle;
@@ -31,7 +28,6 @@ import androidx.fragment.app.Fragment; 
import androidx.fragment.app.FragmentActivity;



import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.permission.service.PermissionSearchIndexablesProvider;

import com.android.packageinstaller.permission.ui.handheld.ManageStandardPermissionsFragment;

import com.android.packageinstaller.permission.ui.handheld.PermissionUsageFragment;

import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;
@@ -53,7 +49,7 @@ public final class ManagePermissionsActivity extends FragmentActivity { 


        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        String permissionName = null;

        String permissionName;

        switch (action) {

            case Intent.ACTION_MANAGE_PERMISSIONS:

                if (DeviceUtils.isTelevision(this)) {
@@ -65,12 +61,6 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
                }

                break;



            case PermissionSearchIndexablesProvider.ACTION_REVIEW_PERMISSION_USAGE:

                if (!isIntentValid(getIntent(), this)) {

                    finish();

                    return;

                }

                // fall through

            case Intent.ACTION_REVIEW_PERMISSION_USAGE: {

                if (!Utils.isPermissionsHubEnabled()) {

                    finish();
@@ -133,17 +123,8 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
                }

            } break;



            case PermissionSearchIndexablesProvider.ACTION_MANAGE_PERMISSION_APPS:

                if (!isIntentValid(getIntent(), this)) {

                    finish();

                    return;

                }

                permissionName = getOriginalKey(getIntent());

                // fall through

            case Intent.ACTION_MANAGE_PERMISSION_APPS: {

                if (permissionName == null) {

                permissionName = getIntent().getStringExtra(Intent.EXTRA_PERMISSION_NAME);

                }



                if (permissionName == null) {

                    Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PERMISSION_NAME");

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.packageinstaller.permission.ui;



import android.app.Activity;

import android.content.Intent;

import android.os.Bundle;



import com.android.packageinstaller.permission.service.PermissionSearchIndexablesProvider;



/**

 * Trampoline activity for {@link ManagePermissionsActivity}.

 */

public class ManagePermissionsActivityTrampoline extends Activity {



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        Intent intent = getIntent();

        if (!PermissionSearchIndexablesProvider.isIntentValid(intent, this)) {

            finish();

            return;

        }



        String action = intent.getAction();

        if (action == null) {

            finish();

            return;

        }



        Intent newIntent = new Intent(this, ManagePermissionsActivity.class)

                .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);

        switch (action) {

            case PermissionSearchIndexablesProvider.ACTION_REVIEW_PERMISSION_USAGE:

                newIntent.setAction(Intent.ACTION_REVIEW_PERMISSION_USAGE);

                break;

            case PermissionSearchIndexablesProvider.ACTION_MANAGE_PERMISSION_APPS:

                newIntent

                        .setAction(Intent.ACTION_MANAGE_PERMISSION_APPS)

                        .putExtra(Intent.EXTRA_PERMISSION_NAME,

                                PermissionSearchIndexablesProvider.getOriginalKey(intent));

                break;

            default:

                finish();

                return;

        }



        startActivity(newIntent);

        finish();

    }

}