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

Commit 932069a5 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Log content provider authority name in traces" into sc-dev am: 57532ac9 

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

Change-Id: Ie802c3ac985492d40fdd61b23efba0dc0f8706ae
parents 278f46b0 57532ac9

core/java/android/content/ContentProvider.java

+22 −16
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                // Return an empty cursor for all columns.

                return new MatrixCursor(cursor.getColumnNames(), 0);

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "query");

            traceBegin(TRACE_TAG_DATABASE, "query: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -285,7 +285,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            // getCallingPackage() isn't available in getType(), as the javadoc states.

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            Trace.traceBegin(TRACE_TAG_DATABASE, "getType");

            traceBegin(TRACE_TAG_DATABASE, "getType: ", uri.getAuthority());

            try {

                return mInterface.getType(uri);

            } catch (RemoteException e) {
@@ -323,7 +323,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    setCallingAttributionSource(original);

                }

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "insert");

            traceBegin(TRACE_TAG_DATABASE, "insert: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -345,7 +345,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return 0;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "bulkInsert");

            traceBegin(TRACE_TAG_DATABASE, "bulkInsert: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -391,7 +391,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    }

                }

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "applyBatch");

            traceBegin(TRACE_TAG_DATABASE, "applyBatch: ", authority);

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -423,7 +423,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return 0;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "delete");

            traceBegin(TRACE_TAG_DATABASE, "delete: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -445,7 +445,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return 0;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "update");

            traceBegin(TRACE_TAG_DATABASE, "update: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -465,7 +465,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(attributionSource, uri, mode);

            Trace.traceBegin(TRACE_TAG_DATABASE, "openFile");

            traceBegin(TRACE_TAG_DATABASE, "openFile: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -486,7 +486,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(attributionSource, uri, mode);

            Trace.traceBegin(TRACE_TAG_DATABASE, "openAssetFile");

            traceBegin(TRACE_TAG_DATABASE, "openAssetFile: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -505,7 +505,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                String method, @Nullable String arg, @Nullable Bundle extras) {

            validateIncomingAuthority(authority);

            Bundle.setDefusable(extras, true);

            Trace.traceBegin(TRACE_TAG_DATABASE, "call");

            traceBegin(TRACE_TAG_DATABASE, "call: ", authority);

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -523,7 +523,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            // getCallingPackage() isn't available in getType(), as the javadoc states.

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            Trace.traceBegin(TRACE_TAG_DATABASE, "getStreamTypes");

            traceBegin(TRACE_TAG_DATABASE, "getStreamTypes: ", uri.getAuthority());

            try {

                return mInterface.getStreamTypes(uri, mimeTypeFilter);

            } catch (RemoteException e) {
@@ -541,7 +541,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(attributionSource, uri, "r");

            Trace.traceBegin(TRACE_TAG_DATABASE, "openTypedAssetFile");

            traceBegin(TRACE_TAG_DATABASE, "openTypedAssetFile: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -569,7 +569,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return null;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "canonicalize");

            traceBegin(TRACE_TAG_DATABASE, "canonicalize: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -605,7 +605,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return null;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "uncanonicalize");

            traceBegin(TRACE_TAG_DATABASE, "uncanonicalize: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -641,7 +641,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                    != PermissionChecker.PERMISSION_GRANTED) {

                return false;

            }

            Trace.traceBegin(TRACE_TAG_DATABASE, "refresh");

            traceBegin(TRACE_TAG_DATABASE, "refresh: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -658,7 +658,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                int uid, int modeFlags) {

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            Trace.traceBegin(TRACE_TAG_DATABASE, "checkUriPermission");

            traceBegin(TRACE_TAG_DATABASE, "checkUriPermission: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {
@@ -2683,4 +2683,10 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
        }

        return uri;

    }



    private static void traceBegin(long traceTag, String methodName, String subInfo) {

        if (Trace.isTagEnabled(traceTag)) {

            Trace.traceBegin(traceTag, methodName + subInfo);

        }

    }

}

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

+60 −5
Original line number Diff line number Diff line
@@ -5996,13 +5996,23 @@ public class ActivityManagerService extends IActivityManager.Stub 
    public final ContentProviderHolder getContentProvider(

            IApplicationThread caller, String callingPackage, String name, int userId,

            boolean stable) {

        traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "getContentProvider: ", name);

        try {

            return mCpHelper.getContentProvider(caller, callingPackage, name, userId, stable);

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

        }

    }















    @Override















    public ContentProviderHolder getContentProviderExternal(















            String name, int userId, IBinder token, String tag) {













        traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "getContentProviderExternal: ", name);













        try {















            return mCpHelper.getContentProviderExternal(name, userId, token, tag);













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }





























    /**









@@ -6017,18 +6027,57 @@ public class ActivityManagerService extends IActivityManager.Stub













    @Deprecated















    @Override















    public void removeContentProviderExternal(String name, IBinder token) {













        traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "removeContentProviderExternal: ", name);













        try {















            removeContentProviderExternalAsUser(name, token, UserHandle.getCallingUserId());













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }





























    @Override















    public void removeContentProviderExternalAsUser(String name, IBinder token, int userId) {













        traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "removeContentProviderExternalAsUser: ", name);













        try {















            mCpHelper.removeContentProviderExternalAsUser(name, token, userId);













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }





























    @Override















    public final void publishContentProviders(IApplicationThread caller,















            List<ContentProviderHolder> providers) {













        if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {













            final int maxLength = 256;













            final StringBuilder sb = new StringBuilder(maxLength);













            sb.append("publishContentProviders: ");













            if (providers != null) {













                boolean first = true;













                for (int i = 0, size = providers.size(); i < size; i++) {













                    final ContentProviderHolder holder = providers.get(i);













                    if (holder != null && holder.info != null && holder.info.authority != null) {













                        final int len = holder.info.authority.length();













                        if (sb.length() + len > maxLength) {













                            sb.append("[[TRUNCATED]]");













                            break;













                        }













                        if (!first) {













                            sb.append(';');













                        } else {













                            first = false;













                        }













                        sb.append(holder.info.authority);













                    }













                }













            }













            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, sb.toString());













        }













        try {















            mCpHelper.publishContentProviders(caller, providers);













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }





























    @Override










@@ -17108,4 +17157,10 @@ public class ActivityManagerService extends IActivityManager.Stub













            SystemClock.sleep(durationMs);















        }















    }

























    static void traceBegin(long traceTag, String methodName, String subInfo) {













        if (Trace.isTagEnabled(traceTag)) {













            Trace.traceBegin(traceTag, methodName + subInfo);













        }













    }















}

























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



+89
−55




























Original line number
Diff line number
Diff line








@@ -58,6 +58,7 @@ import android.os.Process;













import android.os.RemoteCallback;















import android.os.RemoteException;















import android.os.SystemClock;













import android.os.Trace;















import android.os.UserHandle;















import android.provider.Settings;















import android.text.TextUtils;










@@ -707,7 +708,6 @@ public class ContentProviderHelper {













        mService.enforceNotIsolatedCaller("removeContentProvider");















        final long ident = Binder.clearCallingIdentity();















        try {













            synchronized (mService) {















            ContentProviderConnection conn;















            try {















                conn = (ContentProviderConnection) connection;









@@ -720,8 +720,17 @@ public class ContentProviderHelper {













            if (conn == null) {















                throw new NullPointerException("connection is null");















            }













            ActivityManagerService.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,













                    "removeContentProvider: ",













                    (conn.provider != null && conn.provider.info != null













                    ? conn.provider.info.authority : ""));













            try {













                synchronized (mService) {















                    decProviderCountLocked(conn, null, null, stable, true, true);















                }













            } finally {













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













            }















        } finally {















            Binder.restoreCallingIdentity(ident);















        }










@@ -781,8 +790,15 @@ public class ContentProviderHelper {













            throw new NullPointerException("connection is null");















        }





























        ActivityManagerService.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "refContentProvider: ",













                (conn.provider != null && conn.provider.info != null













                ? conn.provider.info.authority : ""));













        try {















            conn.adjustCounts(stable, unstable);















            return !conn.dead;













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }































    void unstableProviderDied(IBinder connection) {









@@ -798,6 +814,12 @@ public class ContentProviderHelper {













            throw new NullPointerException("connection is null");















        }





























        ActivityManagerService.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,













                "unstableProviderDied: ",













                (conn.provider != null && conn.provider.info != null













                ? conn.provider.info.authority : ""));



























        try {















            // Safely retrieve the content provider associated with the connection.















            IContentProvider provider;















            synchronized (mService) {










@@ -835,7 +857,8 @@ public class ContentProviderHelper {













                // As far as we're concerned, this is just like receiving a















                // death notification...  just a bit prematurely.















                mService.reportUidInfoMessageLocked(TAG, "Process " + proc.processName













                            + " (pid " + proc.getPid() + ") early provider death", proc.info.uid);













                                + " (pid " + proc.getPid() + ") early provider death",













                                proc.info.uid);















                final long token = Binder.clearCallingIdentity();















                try {















                    mService.appDiedLocked(proc, "unstable content provider");









@@ -843,6 +866,9 @@ public class ContentProviderHelper {













                    Binder.restoreCallingIdentity(token);















                }















            }













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }































    void appNotRespondingViaProvider(IBinder connection) {









@@ -855,6 +881,11 @@ public class ContentProviderHelper {













            return;















        }





























        ActivityManagerService.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,













                "appNotRespondingViaProvider: ",













                (conn.provider != null && conn.provider.info != null













                ? conn.provider.info.authority : ""));













        try {















            final ProcessRecord host = conn.provider.proc;















            if (host == null) {















                Slog.w(TAG, "Failed to find hosting ProcessRecord");









@@ -862,6 +893,9 @@ public class ContentProviderHelper {













            }































            mService.mAnrHelper.appNotResponding(host, "ContentProvider not responding");













        } finally {













            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);













        }















    }































    /**