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

Commit d4e9007e authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

resolve merge conflicts of 627a84c2 to stage-dr1-aosp-master 

am: c247b8bc

Change-Id: I89d10bc50989ee97e3407a9d3bbe2ef93b52fd42
parents 487ca863 c247b8bc

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -363,8 +363,8 @@ LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) 
LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt

LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt

LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt

LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_DEX_API_FILE)

LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)

LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)

LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)



LOCAL_SRC_ALL := \

config/hiddenapi-force-blacklist.txt

+31 −31
Original line number Diff line number Diff line 
Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V

Ljava/lang/invoke/MethodHandles$Lookup;->IMPL_LOOKUP:Ljava/lang/invoke/MethodHandles$Lookup;

Ljava/lang/invoke/VarHandle;->acquireFence()V

Ljava/lang/invoke/VarHandle;->compareAndExchange([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndSet([[Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->compareAndExchange([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->fullFence()V

Ljava/lang/invoke/VarHandle;->get([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAdd([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAnd([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOr([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXor([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSet([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetAcquire([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetRelease([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getOpaque([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getVolatile([[Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->get([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAdd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAnd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOr([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXor([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSet([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getOpaque([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getVolatile([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->loadLoadFence()V

Ljava/lang/invoke/VarHandle;->releaseFence()V

Ljava/lang/invoke/VarHandle;->set([[Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setOpaque([[Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setRelease([[Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setVolatile([[Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->set([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setOpaque([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setRelease([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setVolatile([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->storeStoreFence()V

Ljava/lang/invoke/VarHandle;->weakCompareAndSet([[Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetAcquire([[Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetPlain([[Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetRelease([[Ljava/lang/Object;)Z
 
Ljava/lang/invoke/VarHandle;->weakCompareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetAcquire([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetPlain([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetRelease([Ljava/lang/Object;)Z

config/hiddenapi-light-greylist.txt

+110 −128

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −7
Original line number Diff line number Diff line
@@ -681,13 +681,6 @@ Lcom/android/internal/location/ProviderRequest;-><init>()V 
Lcom/android/internal/location/ProviderRequest;->interval:J

Lcom/android/internal/location/ProviderRequest;->locationRequests:Ljava/util/List;

Lcom/android/internal/location/ProviderRequest;->reportLocation:Z

Lcom/android/internal/os/BatteryStatsImpl;->getDischargeCurrentLevel()I

Lcom/android/internal/os/BatteryStatsImpl;->getDischargeStartLevel()I

Lcom/android/internal/os/BatteryStatsImpl;->getPhoneOnTime(JI)J

Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalScanningTime(JI)J

Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalStrengthTime(IJI)J

Lcom/android/internal/os/BatteryStatsImpl;->getScreenBrightnessTime(IJI)J

Lcom/android/internal/os/BatteryStatsImpl;->getWifiOnTime(JI)J

Lcom/android/internal/os/SomeArgs;->arg2:Ljava/lang/Object;

Lcom/android/internal/os/SomeArgs;->arg3:Ljava/lang/Object;

Lcom/android/internal/os/SomeArgs;->obtain()Lcom/android/internal/os/SomeArgs;

vr/java/com/google/vr/platform/DeviceInfo.java

+2 −0
Original line number Diff line number Diff line 
package com.google.vr.platform;



import android.annotation.UnsupportedAppUsage;

import android.os.SystemProperties;



/**
@@ -13,6 +14,7 @@ public class DeviceInfo { 
    /**

     * Returns true if this device boots directly in VR mode.

     */

    @UnsupportedAppUsage

    public static boolean getVrBoot() {

        return SystemProperties.getBoolean(VR_MODE_BOOT, false);

    }