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

Commit 009e77a7 authored by Neil Fuller's avatar Neil Fuller
Browse files

Fix checkstyle import ordering issues 

Fix checkstyle import ordering issues. These have been introduced
by various commits, all in goog/master.

This fixes the ordering before I land unrelated changes.

Commits:
640f30a7
782043ca
35cda394
a38fbf63

Bug: 37984816
Test: make -j30 droid
Change-Id: I158dcf38c024a294d38cdb40f8909d5d5113b199
parent 1f07310a

core/java/android/app/SystemServiceRegistry.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ import android.nfc.NfcManager; 
import android.os.BatteryManager;

import android.os.BatteryManager;

import android.os.BatteryStats;

import android.os.BatteryStats;

import android.os.Build;

import android.os.Build;

import android.os.Debug;

import android.os.DropBoxManager;

import android.os.DropBoxManager;

import android.os.HardwarePropertiesManager;

import android.os.HardwarePropertiesManager;

import android.os.IBatteryPropertiesRegistrar;

import android.os.IBatteryPropertiesRegistrar;
@@ -118,9 +117,6 @@ import android.os.health.SystemHealthManager; 
import android.os.storage.StorageManager;

import android.os.storage.StorageManager;

import android.print.IPrintManager;

import android.print.IPrintManager;

import android.print.PrintManager;

import android.print.PrintManager;

import android.telephony.euicc.EuiccManager;

import android.view.autofill.AutofillManager;

import android.view.autofill.IAutoFillManager;

import android.service.oemlock.IOemLockService;

import android.service.oemlock.IOemLockService;

import android.service.oemlock.OemLockManager;

import android.service.oemlock.OemLockManager;

import android.service.persistentdata.IPersistentDataBlockService;

import android.service.persistentdata.IPersistentDataBlockService;
@@ -130,6 +126,7 @@ import android.telecom.TelecomManager; 
import android.telephony.CarrierConfigManager;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.telephony.euicc.EuiccManager;

import android.util.Log;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.LayoutInflater;
@@ -137,6 +134,8 @@ import android.view.WindowManager; 
import android.view.WindowManagerImpl;

import android.view.WindowManagerImpl;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.CaptioningManager;

import android.view.accessibility.CaptioningManager;

import android.view.autofill.AutofillManager;

import android.view.autofill.IAutoFillManager;

import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodManager;

import android.view.textclassifier.TextClassificationManager;

import android.view.textclassifier.TextClassificationManager;

import android.view.textservice.TextServicesManager;

import android.view.textservice.TextServicesManager;