From 5bc026a72d77cf436107e5092dee4dd84d5e5041 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Wed, 29 Apr 2020 13:27:01 +0800 Subject: Revert "Add a null home activity to Shell.apk" This reverts commit 6b1c4a9e09ea096d06351358d731290a11a1e337. Bug: 149226068 Bug: 149307007 Bug: 149780604 Test: $ lunch aosp_crosshatch-userdebug; m # flash and boot on a crosshatch # Settings -> Apps & notifications -> Default apps -> Home apps # Only Quickstep home is there; no Shell home any more $ lunch csi_arm64-userdebug; m # flash the resulted system.img on a crosshatch and boot $ atest DeviceHealthTests # all passed Change-Id: I927b7dae779da25589f2198e0480c0f2a788a7e4 Merged-In: I927b7dae779da25589f2198e0480c0f2a788a7e4 (cherry picked from commit 539298c1b9e1c0a42d041cbc845501cef289abf7) --- packages/Shell/src/com/android/shell/NullHome.java | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 packages/Shell/src/com/android/shell/NullHome.java (limited to 'packages/Shell/src') diff --git a/packages/Shell/src/com/android/shell/NullHome.java b/packages/Shell/src/com/android/shell/NullHome.java deleted file mode 100644 index bd975614a50a..000000000000 --- a/packages/Shell/src/com/android/shell/NullHome.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2020 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. - */ - -package com.android.shell; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; - -/** - * This covers the fallback case where no launcher is available. - * Usually Settings.apk has one fallback home activity. - * Settings.apk, however, is not part of CSI, which needs to be - * standalone (bootable and testable). - */ -public class NullHome extends Activity { - private static final String TAG = "NullHome"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Log.i(TAG, "onCreate"); - setContentView(R.layout.null_home_finishing_boot); - } - - protected void onDestroy() { - super.onDestroy(); - Log.i(TAG, "onDestroy"); - } -} -- cgit v1.2.3-59-g8ed1b