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

Commit 43ed137e authored by Eric Biggers's avatar Eric Biggers
Browse files

SystemUI: remove unused code that showed radio status in CryptKeeper mode 

Since support for Full Disk Encryption was removed in favor of
File Based Encryption, "CryptKeeper mode" no longer exists and the
"vold.decrypt" system property is never set.  Therefore, remove the
unused SystemUI code that showed the radio status in CryptKeeper mode.

This is, very roughly, a revert of ag/1350315 which added this feature
in 2016.  However, the code has changed a bit since then.

Bug: 208476087
Change-Id: I6231762e8353113366eba92b686d6d61582fb2b7
parent d46a6d2a

packages/SystemUI/res/layout/emergency_cryptkeeper_text.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2016 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

  -->



<com.android.systemui.statusbar.policy.EmergencyCryptkeeperText

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:paddingStart="6dp"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:gravity="center_vertical|start"

        />
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar.xml

+0 −7
Original line number Diff line number Diff line
@@ -141,11 +141,4 @@ 
        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>



    <ViewStub

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout="@layout/emergency_cryptkeeper_text"

    />



</com.android.systemui.statusbar.phone.PhoneStatusBarView>

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkController.java

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public interface NetworkController extends CallbackController<SignalCallback>, D 
    void addEmergencyListener(EmergencyListener listener);

    /** */

    void removeEmergencyListener(EmergencyListener listener);

    /** */

    boolean hasEmergencyCryptKeeperText();



    /** */

    boolean isRadioOn();

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import com.android.systemui.statusbar.policy.DataSaverController; 
import com.android.systemui.statusbar.policy.DataSaverControllerImpl;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;

import com.android.systemui.statusbar.policy.EncryptionHelper;

import com.android.systemui.telephony.TelephonyListenerManager;

import com.android.systemui.util.CarrierConfigTracker;
@@ -1445,11 +1444,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        return info;

    }



    /** */

    public boolean hasEmergencyCryptKeeperText() {

        return EncryptionHelper.IS_DATA_ENCRYPTED;

    }



    /** */

    public boolean isRadioOn() {

        return !mAirplaneMode;

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.NotificationShelfController;

import com.android.systemui.statusbar.OperatorNameViewController;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
@@ -261,7 +260,6 @@ public abstract class StatusBarViewModule { 
            StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,

            KeyguardStateController keyguardStateController,

            NotificationPanelViewController notificationPanelViewController,

            NetworkController networkController,

            StatusBarStateController statusBarStateController,

            CommandQueue commandQueue,

            CarrierConfigTracker carrierConfigTracker,
@@ -281,7 +279,6 @@ public abstract class StatusBarViewModule { 
                statusBarHideIconsForBouncerManager,

                keyguardStateController,

                notificationPanelViewController,

                networkController,

                statusBarStateController,

                commandQueue,

                carrierConfigTracker,