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

Commit c415351d authored by Paul Chang's avatar Paul Chang
Browse files

Add getBugreportWhitelistedPackages() in ActivityManagerService 

- add getBugreportWhitelistedPackages() in ActivityManagerService to let Settings Bug report handler access SystemConfig.getBugreportWhitelistedPackages() because SystemConfig should generally only be accessed by the system_server process.

Bug: 143017534
Test: Build pass
Change-Id: I8c9fe7cad8ef489b2c95a3f1052ef239b9c2c0c8
parent feeeb653

core/java/android/app/ActivityManager.java

+14 −0
Original line number Diff line number Diff line
@@ -4417,4 +4417,18 @@ public class ActivityManager { 
            }

        }

    }



    /**

     * Get packages of bugreport-whitelisted apps to handle a bug report.

     *

     * @return packages of bugreport-whitelisted apps to handle a bug report.

     * @hide

     */

    public List<String> getBugreportWhitelistedPackages() {

        try {

            return getService().getBugreportWhitelistedPackages();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

core/java/android/app/IActivityManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ interface IActivityManager { 
    void requestFullBugReport();

    void requestRemoteBugReport();

    boolean launchBugReportHandlerApp();

    List<String> getBugreportWhitelistedPackages();



    @UnsupportedAppUsage

    Intent getIntentForIntentSender(in IIntentSender sender);

services/core/java/com/android/server/am/ActivityManagerService.java

+12 −0
Original line number Diff line number Diff line
@@ -8392,6 +8392,18 @@ public class ActivityManagerService extends IActivityManager.Stub 
        return BugReportHandlerUtil.launchBugReportHandlerApp(mContext);

    }













    /**













     * Get packages of bugreport-whitelisted apps to handle a bug report.













     *













     * @return packages of bugreport-whitelisted apps to handle a bug report.













     */













    @Override













    public List<String> getBugreportWhitelistedPackages() {













        enforceCallingPermission(android.Manifest.permission.MANAGE_DEBUGGING,













                "getBugreportWhitelistedPackages");













        return new ArrayList<>(SystemConfig.getInstance().getBugreportWhitelistedPackages());













    }



























    public void registerProcessObserver(IProcessObserver observer) {















        enforceCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER,















                "registerProcessObserver()");