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

Commit 2bfc3d8f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Framework: Remove orphaned Theme related code 

Change-Id: I930d4cc75e655c5bc37532e6a1425d27bd1ee661

Conflicts:
	services/java/com/android/server/NotificationManagerService.java
parent a60060f0

services/java/com/android/server/NotificationManagerService.java

+1 −21
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.media.IAudioService; 
import android.media.IRingtonePlayer;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;
@@ -85,9 +84,6 @@ import org.xmlpull.v1.XmlPullParser; 
import org.xmlpull.v1.XmlPullParserException;



import java.io.File;



import com.android.internal.app.ThemeUtils;



import java.io.FileDescriptor;

import java.io.FileInputStream;

import java.io.FileNotFoundException;
@@ -97,6 +93,7 @@ import java.lang.reflect.Array; 
import java.util.ArrayDeque;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;
@@ -144,7 +141,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
    private static final String ENABLED_NOTIFICATION_LISTENERS_SEPARATOR = ":";



    final Context mContext;

    Context mUiContext;

    final IActivityManager mAm;

    final UserManager mUserManager;

    final IBinder mForegroundToken = new Binder();
@@ -1163,13 +1159,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
        }

    };



    private BroadcastReceiver mThemeChangeReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            mUiContext = null;

        }

    };



    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {
@@ -1482,7 +1471,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
        ledObserver.observe();

        QuietHoursSettingsObserver qhObserver = new QuietHoursSettingsObserver(mHandler);

        qhObserver.observe();

        ThemeUtils.registerThemeChangeReceiver(mContext, mThemeChangeReceiver);



        // spin up NotificationScorers

        String[] notificationScorerNames = resources.getStringArray(
@@ -2506,13 +2494,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
        return -1;

    }



    private Context getUiContext() {

        if (mUiContext == null) {

            mUiContext = ThemeUtils.createUiContext(mContext);

        }

        return mUiContext != null ? mUiContext : mContext;

    }



    private void updateNotificationPulse() {

        synchronized (mNotificationList) {

            updateLightsLocked();
@@ -2556,7 +2537,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
                }

                pw.println("  ");

            }



        }



        synchronized (mNotificationList) {