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

Commit ec537527 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Using Slog everywhere."

parents 3f623861 2fa4b2a0

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarAppsModel.java

+4 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.pm.UserInfo; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;
@@ -134,16 +133,16 @@ class NavigationBarAppsModel { 
        try {

            ActivityInfo info = getPackageManager().getActivityInfo(component, 0, appUserId);

            if (info == null) {

                Log.e(TAG, "Activity " + component + " is not installed.");

                Slog.e(TAG, "Activity " + component + " is not installed.");

                return null;

            }



            if (!info.exported) {

                Log.e(TAG, "Activity " + component + " doesn't have 'exported' attribute.");

                Slog.e(TAG, "Activity " + component + " doesn't have 'exported' attribute.");

                return null;

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Failed to get activity info for " + component, e);

            Slog.e(TAG, "Failed to get activity info for " + component, e);

            return null;

        }
@@ -164,7 +163,7 @@ class NavigationBarAppsModel { 
            }

        }



        Log.e(TAG, "Activity doesn't have category Intent.CATEGORY_LAUNCHER " + component);

        Slog.e(TAG, "Activity doesn't have category Intent.CATEGORY_LAUNCHER " + component);

        return null;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarRecents.java

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.Handler; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Slog;

import android.util.SparseBooleanArray;

import android.view.LayoutInflater;
@@ -173,9 +172,9 @@ class NavigationBarRecents extends LinearLayout { 
                try {

                    manager.startActivityFromRecents(taskPersistentId, null /* options */);

                } catch (RemoteException e) {

                    Log.e(TAG, "Exception when activating a recent task", e);

                    Slog.e(TAG, "Exception when activating a recent task", e);

                } catch (IllegalArgumentException e) {

                    Log.e(TAG, "Exception when activating a recent task", e);

                    Slog.e(TAG, "Exception when activating a recent task", e);

                }

            }

        });
@@ -244,7 +243,7 @@ class NavigationBarRecents extends LinearLayout { 
                ris = packageManager.queryIntentActivitiesAsUser(intentToResolve, 0, userId);

            }

            if (ris == null || ris.size() <= 0) {

                Log.e(TAG, "Failed to build intent for " + packageName);

                Slog.e(TAG, "Failed to build intent for " + packageName);

                return null;

            }

            return new ComponentName(ris.get(0).activityInfo.packageName,