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

Commit 1e53b596 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Fix dump to not require extra permissions." into lmp-mr1-dev 

automerge: bccbea8d

* commit 'bccbea8d':
  Fix dump to not require extra permissions.
parents 012da70f bccbea8d

src/java/com/android/internal/telephony/SubscriptionController.java

+49 −44
Original line number Diff line number Diff line
@@ -1541,6 +1541,8 @@ public class SubscriptionController extends ISub.Stub { 
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,

                "Requires DUMP");

        final long token = Binder.clearCallingIdentity();

        try {

            pw.println("SubscriptionController:");

            pw.println(" defaultSubId=" + getDefaultSubId());

            pw.println(" defaultDataSubId=" + getDefaultDataSubId());
@@ -1588,5 +1590,8 @@ public class SubscriptionController extends ISub.Stub { 
            pw.flush();

            pw.println("++++++++++++++++++++++++++++++++");

            pw.flush();

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }

}