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

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

Use Slog instead of Log in UPS. 

So that permission logs don't get flushed away when app logcat buffer
is full.

Slog is actually MODULE_LIBRARIES system API since ag/16823586.

Bug: 282984463
Test: presubmit
Change-Id: Id69a10a9d0c03145353fb96c1d0b31d34d1c9d0b
parent ebb6f311

services/permission/java/com/android/server/permission/access/AccessPersistence.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Message 
import android.os.SystemClock

import android.os.UserHandle

import android.util.AtomicFile

import android.util.Log

import android.util.Slog

import android.util.SparseLongArray

import com.android.internal.annotations.GuardedBy

import com.android.internal.os.BackgroundThread
@@ -98,7 +98,7 @@ class AccessPersistence( 
            AtomicFile(this).readWithReserveCopy { it.parseBinaryXml(block) }

            true

        } catch (e: FileNotFoundException) {

            Log.i(LOG_TAG, "$this not found")

            Slog.i(LOG_TAG, "$this not found")

            false

        } catch (e: Exception) {

            throw IllegalStateException("Failed to read $this", e)
@@ -176,7 +176,7 @@ class AccessPersistence( 
        try {

            AtomicFile(this).writeWithReserveCopy { it.serializeBinaryXml(block) }

        } catch (e: Exception) {

            Log.e(LOG_TAG, "Failed to serialize $this", e)

            Slog.e(LOG_TAG, "Failed to serialize $this", e)

        }

    }

services/permission/java/com/android/server/permission/access/AccessPolicy.kt

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.permission.access



import android.util.Log

import android.util.Slog

import com.android.modules.utils.BinaryXmlPullParser

import com.android.modules.utils.BinaryXmlSerializer

import com.android.server.SystemConfig
@@ -326,7 +326,7 @@ class AccessPolicy private constructor( 
                    VERSION_LATEST

            }

            version == VERSION_LATEST -> {}

            else -> Log.w(

            else -> Slog.w(

                LOG_TAG, "Unexpected version $version for package $packageName," +

                    "latest version is $VERSION_LATEST"

            )
@@ -343,7 +343,7 @@ class AccessPolicy private constructor( 
                        }

                    }

                }

                else -> Log.w(LOG_TAG, "Ignoring unknown tag $tagName when parsing system state")

                else -> Slog.w(LOG_TAG, "Ignoring unknown tag $tagName when parsing system state")

            }

        }

    }
@@ -372,7 +372,7 @@ class AccessPolicy private constructor( 
                    }

                }

                else -> {

                    Log.w(

                    Slog.w(

                        LOG_TAG,

                        "Ignoring unknown tag $tagName when parsing user state for user $userId"

                    )
@@ -387,12 +387,12 @@ class AccessPolicy private constructor( 
        forEachTag {

            when (tagName) {

                TAG_PACKAGE -> parsePackageVersion(packageVersions)

                else -> Log.w(LOG_TAG, "Ignoring unknown tag $name when parsing package versions")

                else -> Slog.w(LOG_TAG, "Ignoring unknown tag $name when parsing package versions")

            }

        }

        packageVersions.forEachReversedIndexed { packageVersionIndex, packageName, _ ->

            if (packageName !in state.externalState.packageStates) {

                Log.w(LOG_TAG, "Dropping unknown $packageName when parsing package versions")

                Slog.w(LOG_TAG, "Dropping unknown $packageName when parsing package versions")

                packageVersions.removeAt(packageVersionIndex)

                userState.requestWriteMode(WriteMode.ASYNCHRONOUS)

            }

services/permission/java/com/android/server/permission/access/appop/AppIdAppOpMigration.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.permission.access.appop



import android.os.Process

import android.util.Log

import android.util.Slog

import com.android.server.LocalServices

import com.android.server.appop.AppOpMigrationHelper

import com.android.server.permission.access.MutableAccessState
@@ -40,7 +40,7 @@ class AppIdAppOpMigration { 
            val packageNames = state.externalState.appIdPackageNames[appId]

            // Non-application UIDs may not have an Android package but may still have app op state.

            if (packageNames == null && appId >= Process.FIRST_APPLICATION_UID) {

                Log.w(LOG_TAG, "Dropping unknown app ID $appId when migrating app op state")

                Slog.w(LOG_TAG, "Dropping unknown app ID $appId when migrating app op state")

                return@forEach

            }

services/permission/java/com/android/server/permission/access/appop/AppIdAppOpPersistence.kt

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.permission.access.appop



import android.os.Process

import android.util.Log

import android.util.Slog

import com.android.modules.utils.BinaryXmlPullParser

import com.android.modules.utils.BinaryXmlSerializer

import com.android.server.permission.access.AccessState
@@ -46,14 +46,14 @@ class AppIdAppOpPersistence : BaseAppOpPersistence() { 
        forEachTag {

            when (tagName) {

                TAG_APP_ID -> parseAppId(appIdAppOpModes)

                else -> Log.w(LOG_TAG, "Ignoring unknown tag $name when parsing app-op state")

                else -> Slog.w(LOG_TAG, "Ignoring unknown tag $name when parsing app-op state")

            }

        }

        userState.appIdAppOpModes.forEachReversedIndexed { appIdIndex, appId, _ ->

            // Non-application UIDs may not have an Android package but may still have app op state.

            if (appId !in state.externalState.appIdPackageNames &&

                appId >= Process.FIRST_APPLICATION_UID) {

                Log.w(LOG_TAG, "Dropping unknown app ID $appId when parsing app-op state")

                Slog.w(LOG_TAG, "Dropping unknown app ID $appId when parsing app-op state")

                appIdAppOpModes.removeAt(appIdIndex)

                userState.requestWriteMode(WriteMode.ASYNCHRONOUS)

            }

services/permission/java/com/android/server/permission/access/appop/BaseAppOpPersistence.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.permission.access.appop



import android.util.Log

import android.util.Slog

import com.android.modules.utils.BinaryXmlPullParser

import com.android.modules.utils.BinaryXmlSerializer

import com.android.server.permission.access.AccessState
@@ -40,7 +40,7 @@ abstract class BaseAppOpPersistence { 
        forEachTag {

            when (tagName) {

                TAG_APP_OP -> parseAppOp(appOpModes)

                else -> Log.w(LOG_TAG, "Ignoring unknown tag $name when parsing app-op state")

                else -> Slog.w(LOG_TAG, "Ignoring unknown tag $name when parsing app-op state")

            }

        }

    }