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

Commit 33e17a99 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

Revert "Prepare AttributionSource to expose to native" 

Revert "Prepare AttributionSource to expose to native - native"

Revert submission 14225527-bug-158792096-04/16/21-1

Reason for revert: b/186467053
Reverted Changes:
I16740cc2d:Prepare AttributionSource to expose to native - na...
I4e050e78b:Prepare AttributionSource to expose to native

Change-Id: I83e4091231241c2211edf5745735f4ee993c6680
parent 7b7ea938

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ java_defaults { 
        "tv_tuner_resource_manager_aidl_interface-java",

        "soundtrigger_middleware-aidl-java",

        "modules-utils-os",

        "framework-permission-aidl-java",

    ],

}

core/java/android/content/AttributionSource.java

+265 −120

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/PermissionChecker.java

+408 −94

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/permission/PermissionManager.java

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.os.Build.VERSION_CODES.S; 


import android.Manifest;

import android.annotation.CheckResult;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -32,7 +31,6 @@ import android.annotation.UserIdInt; 
import android.app.ActivityManager;

import android.app.ActivityThread;

import android.app.AppGlobals;

import android.app.AppOpsManager;

import android.app.IActivityManager;

import android.app.PropertyInvalidatedCache;

import android.compat.annotation.ChangeId;
@@ -65,8 +63,6 @@ import com.android.internal.R; 
import com.android.internal.annotations.Immutable;

import com.android.internal.util.CollectionUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+0 −420

File changed.

Preview size limit exceeded, changes collapsed.