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

Commit 7a74fa5f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5409551 from 150f666c to qt-release 

Change-Id: I0e6f8f6df2bb4cf2d8387f410fd2b2b98b08ac9d
parents 9cbb84b5 150f666c

apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class KernelCpuThreadReaderPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        assertNotNull(mKernelCpuThreadReader);

        while (state.keepRunning()) {

            this.mKernelCpuThreadReader.getCurrentProcessCpuUsage();

            this.mKernelCpuThreadReader.getProcessCpuUsage();

        }

    }

}

api/current.txt

+14 −4
Original line number Diff line number Diff line
@@ -6963,7 +6963,7 @@ package android.app.admin { 














  public abstract static class DevicePolicyManager.InstallSystemUpdateCallback {















    ctor public DevicePolicyManager.InstallSystemUpdateCallback();













    method public void onInstallUpdateError(int, String);













    method public void onInstallUpdateError(int, @NonNull String);















    field public static final int UPDATE_ERROR_BATTERY_LOW = 5; // 0x5















    field public static final int UPDATE_ERROR_FILE_NOT_FOUND = 4; // 0x4















    field public static final int UPDATE_ERROR_INCORRECT_OS_VERSION = 2; // 0x2










@@ -13089,10 +13089,10 @@ package android.database.sqlite {













    method @Deprecated public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String[], String, String);















    method public int delete(@NonNull android.database.sqlite.SQLiteDatabase, @Nullable String, @Nullable String[]);















    method @Nullable public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();













    method public boolean getDistinct();















    method @Nullable public java.util.Map<java.lang.String,java.lang.String> getProjectionMap();













    method public boolean getStrict();















    method @Nullable public String getTables();













    method public boolean isDistinct();













    method public boolean isStrict();















    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String);















    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String);















    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String, android.os.CancellationSignal);










@@ -29267,7 +29267,6 @@ package android.net {













    method public abstract boolean isRelative();















    method public android.net.Uri normalizeScheme();















    method public static android.net.Uri parse(String);













    method @NonNull public String toSafeString();















    method public abstract String toString();















    method public static android.net.Uri withAppendedPath(android.net.Uri, String);















    method public static void writeToParcel(android.os.Parcel, android.net.Uri);










@@ -53048,6 +53047,16 @@ package android.view.autofill {



























package android.view.contentcapture {



























  public final class ContentCaptureCondition implements android.os.Parcelable {













    ctor public ContentCaptureCondition(@NonNull android.content.LocusId, int);













    method public int describeContents();













    method public int getFlags();













    method @NonNull public android.content.LocusId getLocusId();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureCondition> CREATOR;













    field public static final int FLAG_IS_REGEX = 2; // 0x2













  }



























  public final class ContentCaptureContext implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public static android.view.contentcapture.ContentCaptureContext forLocusId(@NonNull String);









@@ -53064,6 +53073,7 @@ package android.view.contentcapture {













  }





























  public final class ContentCaptureManager {













    method @Nullable public java.util.Set<android.view.contentcapture.ContentCaptureCondition> getContentCaptureConditions();















    method @Nullable public android.content.ComponentName getServiceComponentName();















    method public boolean isContentCaptureEnabled();















    method public void removeUserData(@NonNull android.view.contentcapture.UserDataRemovalRequest);

























api/system-current.txt



+12
−7






























Original line number
Diff line number
Diff line








@@ -491,12 +491,12 @@ package android.app {













    ctor public InstantAppResolverService();















    method public final void attachBaseContext(android.content.Context);















    method public final android.os.IBinder onBind(android.content.Intent);













    method @Deprecated public void onGetInstantAppIntentFilter(int[], String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppIntentFilter(android.content.Intent, int[], String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method public void onGetInstantAppIntentFilter(android.content.Intent, int[], android.os.UserHandle, String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppResolveInfo(int[], String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppResolveInfo(android.content.Intent, int[], String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method public void onGetInstantAppResolveInfo(android.content.Intent, int[], android.os.UserHandle, String, android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppIntentFilter(@Nullable int[], @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppIntentFilter(@NonNull android.content.Intent, @Nullable int[], @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method public void onGetInstantAppIntentFilter(@NonNull android.content.Intent, @Nullable int[], @NonNull android.os.UserHandle, @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppResolveInfo(@Nullable int[], @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method @Deprecated public void onGetInstantAppResolveInfo(@NonNull android.content.Intent, @Nullable int[], @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);













    method public void onGetInstantAppResolveInfo(@NonNull android.content.Intent, @Nullable int[], @NonNull android.os.UserHandle, @NonNull String, @NonNull android.app.InstantAppResolverService.InstantAppResolutionCallback);















  }





























  public static final class InstantAppResolverService.InstantAppResolutionCallback {










@@ -4233,6 +4233,10 @@ package android.net {













    field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42















  }



























  public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {













    method @NonNull public String toSafeString();













  }



























  public class VpnService extends android.app.Service {















    method @RequiresPermission(android.Manifest.permission.CONTROL_VPN) public static void prepareAndAuthorize(android.content.Context);















  }










@@ -5664,7 +5668,7 @@ package android.os.image {













  }





























  public static interface DynamicSystemClient.OnStatusChangedListener {













    method public void onStatusChanged(int, int, long);













    method public void onStatusChanged(int, int, long, @Nullable Throwable);















  }





























}










@@ -6444,6 +6448,7 @@ package android.service.contentcapture {













    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);















    method public void onDisconnected();















    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);













    method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set<android.view.contentcapture.ContentCaptureCondition>);















    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);















    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";















    field public static final String SERVICE_META_DATA = "android.content_capture";

































api/test-current.txt



+10
−0






























Original line number
Diff line number
Diff line








@@ -2457,6 +2457,7 @@ package android.service.contentcapture {













    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);















    method public void onDisconnected();















    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);













    method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set<android.view.contentcapture.ContentCaptureCondition>);















    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);















    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";















    field public static final String SERVICE_META_DATA = "android.content_capture";










@@ -2662,6 +2663,15 @@ package android.telephony {













    method public void setVoiceRoamingType(int);















  }





























  public final class SmsManager {













    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int checkSmsShortCodeDestination(String, String);













    field public static final int SMS_CATEGORY_FREE_SHORT_CODE = 1; // 0x1













    field public static final int SMS_CATEGORY_NOT_SHORT_CODE = 0; // 0x0













    field public static final int SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE = 3; // 0x3













    field public static final int SMS_CATEGORY_PREMIUM_SHORT_CODE = 4; // 0x4













    field public static final int SMS_CATEGORY_STANDARD_SHORT_CODE = 2; // 0x2













  }





























  public class TelephonyManager {















    method public int checkCarrierPrivilegesForPackage(String);















    method public int getCarrierIdListVersion();

































cmds/bootanimation/BootAnimation.cpp



+23
−23






























Original line number
Diff line number
Diff line








@@ -101,7 +101,7 @@ static constexpr size_t TEXT_POS_LEN_MAX = 16;





























BootAnimation::BootAnimation(sp<Callbacks> callbacks)















        : Thread(false), mClockEnabled(true), mTimeIsAccurate(false),













        mTimeFormat12Hour(false), mTimeCheckThread(NULL), mCallbacks(callbacks) {













        mTimeFormat12Hour(false), mTimeCheckThread(nullptr), mCallbacks(callbacks) {















    mSession = new SurfaceComposerClient();































    std::string powerCtl = android::base::GetProperty("sys.powerctl", "");










@@ -156,7 +156,7 @@ void BootAnimation::binderDied(const wp<IBinder>&)













status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,















        const char* name) {















    Asset* asset = assets.open(name, Asset::ACCESS_BUFFER);













    if (asset == NULL)













    if (asset == nullptr)















        return NO_INIT;















    SkBitmap bitmap;















    sk_sp<SkData> data = SkData::MakeWithoutCopy(asset->getBuffer(false),










@@ -234,7 +234,7 @@ status_t BootAnimation::initTexture(FileMap* map, int* width, int* height)













        case kN32_SkColorType:















            if (!mUseNpotTextures && (tw != w || th != h)) {















                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,













                        GL_UNSIGNED_BYTE, 0);













                        GL_UNSIGNED_BYTE, nullptr);















                glTexSubImage2D(GL_TEXTURE_2D, 0,















                        0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, p);















            } else {









@@ -246,7 +246,7 @@ status_t BootAnimation::initTexture(FileMap* map, int* width, int* height)













        case kRGB_565_SkColorType:















            if (!mUseNpotTextures && (tw != w || th != h)) {















                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,













                        GL_UNSIGNED_SHORT_5_6_5, 0);













                        GL_UNSIGNED_SHORT_5_6_5, nullptr);















                glTexSubImage2D(GL_TEXTURE_2D, 0,















                        0, 0, w, h, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, p);















            } else {










@@ -304,10 +304,10 @@ status_t BootAnimation::readyToRun() {





























    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);





























    eglInitialize(display, 0, 0);













    eglInitialize(display, nullptr, nullptr);















    eglChooseConfig(display, attribs, &config, 1, &numConfigs);













    surface = eglCreateWindowSurface(display, config, s.get(), NULL);













    context = eglCreateContext(display, config, NULL, NULL);













    surface = eglCreateWindowSurface(display, config, s.get(), nullptr);













    context = eglCreateContext(display, config, nullptr, nullptr);















    eglQuerySurface(display, surface, EGL_WIDTH, &w);















    eglQuerySurface(display, surface, EGL_HEIGHT, &h);


























@@ -671,7 +671,7 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)













    // Parse the description file















    for (;;) {















        const char* endl = strstr(s, "\n");













        if (endl == NULL) break;













        if (endl == nullptr) break;















        String8 line(s, endl - s);















        const char* l = line.string();















        int fps = 0;










@@ -699,8 +699,8 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)













            part.count = count;















            part.pause = pause;















            part.path = path;













            part.audioData = NULL;













            part.animation = NULL;













            part.audioData = nullptr;













            part.animation = nullptr;















            if (!parseColor(color, part.backgroundColor)) {















                SLOGE("> invalid color '#%s'", color);















                part.backgroundColor[0] = 0.0f;









@@ -716,9 +716,9 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)













            part.playUntilComplete = false;















            part.count = 1;















            part.pause = 0;













            part.audioData = NULL;













            part.audioData = nullptr;















            part.animation = loadAnimation(String8(SYSTEM_BOOTANIMATION_FILE));













            if (part.animation != NULL)













            if (part.animation != nullptr)















                animation.parts.add(part);















        }















        s = ++endl;









@@ -731,7 +731,7 @@ bool BootAnimation::preloadZip(Animation& animation)













{















    // read all the data structures















    const size_t pcount = animation.parts.size();













    void *cookie = NULL;













    void *cookie = nullptr;















    ZipFileRO* zip = animation.zip;















    if (!zip->startIteration(&cookie)) {















        return false;









@@ -739,7 +739,7 @@ bool BootAnimation::preloadZip(Animation& animation)





























    ZipEntryRO entry;















    char name[ANIM_ENTRY_NAME_MAX];













    while ((entry = zip->nextEntry(cookie)) != NULL) {













    while ((entry = zip->nextEntry(cookie)) != nullptr) {















        const int foundEntryName = zip->getEntryFileName(entry, name, ANIM_ENTRY_NAME_MAX);















        if (foundEntryName > ANIM_ENTRY_NAME_MAX || foundEntryName == -1) {















            SLOGE("Error fetching entry file name");









@@ -762,7 +762,7 @@ bool BootAnimation::preloadZip(Animation& animation)













                if (path == animation.parts[j].path) {















                    uint16_t method;















                    // supports only stored png files













                    if (zip->getEntryInfo(entry, &method, NULL, NULL, NULL, NULL, NULL)) {













                    if (zip->getEntryInfo(entry, &method, nullptr, nullptr, nullptr, nullptr, nullptr)) {















                        if (method == ZipFileRO::kCompressStored) {















                            FileMap* map = zip->createEntryFileMap(entry);















                            if (map) {










@@ -800,7 +800,7 @@ bool BootAnimation::preloadZip(Animation& animation)













        for (size_t frameIdx = 0; frameIdx < part.frames.size(); frameIdx++) {















            const char* endl = strstr(trimDataStr, "\n");















            // No more trimData for this part.













            if (endl == NULL) {













            if (endl == nullptr) {















                break;















            }















            String8 line(trimDataStr, endl - trimDataStr);










@@ -927,7 +927,7 @@ bool BootAnimation::playAnimation(const Animation& animation)













        glBindTexture(GL_TEXTURE_2D, 0);































        // Handle animation package













        if (part.animation != NULL) {













        if (part.animation != nullptr) {















            playAnimation(*part.animation);















            if (exitPending())















                break;










@@ -1001,7 +1001,7 @@ bool BootAnimation::playAnimation(const Animation& animation)













                    spec.tv_nsec = (now + delay) % 1000000000;















                    int err;















                    do {













                        err = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &spec, NULL);













                        err = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &spec, nullptr);















                    } while (err<0 && errno == EINTR);















                }


























@@ -1090,13 +1090,13 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn)













    if (mLoadedFiles.indexOf(fn) >= 0) {















        SLOGE("File \"%s\" is already loaded. Cyclic ref is not allowed",















            fn.string());













        return NULL;













        return nullptr;















    }















    ZipFileRO *zip = ZipFileRO::open(fn);













    if (zip == NULL) {













    if (zip == nullptr) {















        SLOGE("Failed to open animation zip \"%s\": %s",















            fn.string(), strerror(errno));













        return NULL;













        return nullptr;















    }































    Animation *animation =  new Animation;









@@ -1107,7 +1107,7 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn)





























    parseAnimationDesc(*animation);















    if (!preloadZip(*animation)) {













        return NULL;













        return nullptr;















    }










































@@ -1135,7 +1135,7 @@ bool BootAnimation::updateIsTimeAccurate() {













    }































    FILE* file = fopen(LAST_TIME_CHANGED_FILE_PATH, "r");













    if (file != NULL) {













    if (file != nullptr) {















      long long lastChangedTime = 0;















      fscanf(file, "%lld", &lastChangedTime);















      fclose(file);