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

Commit 214bf65c authored by Paul Hobbs's avatar Paul Hobbs
Browse files

Revert "Version LoadedApk cache using base code path"

Revert submission 15058002

Reason for revert: Causes crash in com.android.cts.splitapp, breaks android.appsecurity.cts.SplitTests#testFeatureWithoutRestart_full.
Bug: 192242649

Reverted Changes:
Icf81845da:Apply overlay changes with config change
Iea54abf38:Version LoadedApk cache using base code path
I986563142:Revert "Deprecate Context#createApplicationContext...

Change-Id: Iefd431eaddccab8ccbf33bdd701516e34118615f
parent fa5ab2d2
Loading
Loading
Loading
Loading
+229 −296

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UiContext;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.AttributionSource;
import android.content.AutofillOptions;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -61,6 +60,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.content.AttributionSource;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -2461,7 +2461,7 @@ class ContextImpl extends Context {
    public Context createApplicationContext(ApplicationInfo application, int flags)
            throws NameNotFoundException {
        LoadedApk pi = mMainThread.getPackageInfo(application, mResources.getCompatibilityInfo(),
                flags | CONTEXT_REGISTER_PACKAGE, false);
                flags | CONTEXT_REGISTER_PACKAGE);
        if (pi != null) {
            ContextImpl c = new ContextImpl(this, mMainThread, pi, ContextParams.EMPTY,
                    mAttributionSource.getAttributionTag(),
+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ java_genrule {
        ":FrameworksCoreTests_keyset_splat_api",
        ":FrameworksCoreTests_locales",
        ":FrameworksCoreTests_overlay_config",
        ":FrameworksCoreTests_res_version_after",
        ":FrameworksCoreTests_res_version_before",
        ":FrameworksCoreTests_version_1",
        ":FrameworksCoreTests_version_1_diff",
        ":FrameworksCoreTests_version_1_nosys",
+0 −22
Original line number Diff line number Diff line
package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_base_license"],
}

android_test_helper_app {
    name: "FrameworksCoreTests_res_version_before",
    defaults: ["FrameworksCoreTests_apks_defaults"],
    resource_dirs: ["res_before"],
    certificate: ":FrameworksCoreTests_unit_test_cert",
}

android_test_helper_app {
    name: "FrameworksCoreTests_res_version_after",
    defaults: ["FrameworksCoreTests_apks_defaults"],
    resource_dirs: ["res_after"],
    certificate: ":FrameworksCoreTests_unit_test_cert",
}
+0 −20
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.frameworks.coretests.res_version">
    <application android:hasCode="false"/>
</manifest>
Loading