From 383db5ebcc3a4a615faf249bf4f126f42e80b82e Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Wed, 22 Jun 2016 15:21:38 +0100 Subject: [PATCH] Update package names to work with the proto3 compiler Bug: b/28974522 Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a --- .../android/internal/app/ChooserActivity.java | 2 +- .../internal/app/ResolverActivity.java | 2 +- .../internal/logging/MetricsLogger.java | 2 +- .../com/android/keyguard/EmergencyButton.java | 2 +- .../printspooler/ui/AddPrinterActivity.java | 2 +- .../printspooler/ui/PrintActivity.java | 2 +- .../ui/SelectPrinterActivity.java | 2 +- .../com/android/settingslib/HelpUtils.java | 2 +- .../shell/BugreportProgressService.java | 2 +- .../systemui/analytics/DataCollector.java | 4 +- .../analytics/SensorLoggerSession.java | 8 +- .../android/systemui/doze/DozeSensors.java | 2 +- .../src/com/android/systemui/qs/QSPanel.java | 2 +- .../src/com/android/systemui/qs/QSTile.java | 2 +- .../systemui/qs/customize/QSCustomizer.java | 2 +- .../systemui/qs/customize/TileAdapter.java | 2 +- .../systemui/qs/external/CustomTile.java | 2 +- .../systemui/qs/tiles/AirplaneModeTile.java | 2 +- .../systemui/qs/tiles/BatteryTile.java | 2 +- .../systemui/qs/tiles/BluetoothTile.java | 2 +- .../android/systemui/qs/tiles/CastTile.java | 2 +- .../systemui/qs/tiles/CellularTile.java | 2 +- .../systemui/qs/tiles/ColorInversionTile.java | 2 +- .../systemui/qs/tiles/DataSaverTile.java | 2 +- .../android/systemui/qs/tiles/DndTile.java | 2 +- .../systemui/qs/tiles/FlashlightTile.java | 2 +- .../systemui/qs/tiles/HotspotTile.java | 2 +- .../android/systemui/qs/tiles/IntentTile.java | 2 +- .../systemui/qs/tiles/LocationTile.java | 2 +- .../systemui/qs/tiles/NightDisplayTile.java | 2 +- .../systemui/qs/tiles/RotationLockTile.java | 2 +- .../systemui/qs/tiles/UserDetailView.java | 2 +- .../android/systemui/qs/tiles/UserTile.java | 2 +- .../android/systemui/qs/tiles/WifiTile.java | 2 +- .../systemui/qs/tiles/WorkModeTile.java | 2 +- .../com/android/systemui/recents/Recents.java | 2 +- .../systemui/recents/RecentsActivity.java | 2 +- .../recents/grid/RecentsGridActivity.java | 2 +- .../systemui/recents/views/RecentsView.java | 2 +- .../systemui/recents/views/TaskStackView.java | 2 +- .../views/TaskStackViewTouchHandler.java | 2 +- .../systemui/recents/views/TaskView.java | 2 +- .../settings/BrightnessController.java | 2 +- .../systemui/settings/BrightnessDialog.java | 2 +- .../shortcut/ShortcutKeyDispatcher.java | 2 +- .../systemui/stackdivider/DividerView.java | 2 +- .../systemui/statusbar/BaseStatusBar.java | 2 +- .../statusbar/ExpandableNotificationRow.java | 2 +- .../systemui/statusbar/KeyboardShortcuts.java | 2 +- .../systemui/statusbar/NotificationGuts.java | 2 +- .../phone/NavigationBarGestureHelper.java | 2 +- .../statusbar/phone/PhoneStatusBar.java | 2 +- .../statusbar/phone/QuickStatusBarHeader.java | 2 +- .../statusbar/policy/RemoteInputView.java | 2 +- .../policy/UserSwitcherController.java | 2 +- .../stack/NotificationStackScrollLayout.java | 2 +- .../systemui/tuner/BatteryPreference.java | 2 +- .../systemui/tuner/DemoModeFragment.java | 2 +- .../PowerNotificationControlsFragment.java | 2 +- .../systemui/tuner/StatusBarSwitch.java | 2 +- .../android/systemui/tuner/TunerFragment.java | 2 +- .../com/android/systemui/volume/Events.java | 2 +- .../android/systemui/volume/ZenModePanel.java | 2 +- .../server/GestureLauncherService.java | 2 +- .../server/am/ActivityMetricsLogger.java | 2 +- .../java/com/android/server/am/AppErrors.java | 2 +- .../server/am/AppNotRespondingDialog.java | 2 +- .../IpConnectivityEventBuilder.java | 131 ++++++++++-------- .../connectivity/IpConnectivityMetrics.java | 2 +- .../server/dreams/DreamController.java | 2 +- .../fingerprint/AuthenticationClient.java | 2 +- .../server/fingerprint/EnrollClient.java | 2 +- .../android/server/policy/GlobalActions.java | 2 +- .../DevicePolicyManagerService.java | 2 +- .../com/android/server/print/UserState.java | 2 +- .../IpConnectivityEventBuilderTest.java | 2 +- .../IpConnectivityMetricsTest.java | 2 +- tools/aapt2/compile/Compile.cpp | 4 +- tools/aapt2/compile/Png.cpp | 7 + tools/aapt2/compile/Png.h | 4 +- tools/aapt2/proto/TableProtoSerializer.cpp | 4 +- 81 files changed, 165 insertions(+), 145 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 3b6073a6eacc1..d8f7907524ee5 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -70,7 +70,7 @@ import android.widget.ListView; import com.android.internal.R; import com.android.internal.app.ResolverActivity.TargetInfo; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.google.android.collect.Lists; import java.io.File; diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 1e26c92dd7644..72a40b7dcb45c 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -71,7 +71,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.ResolverDrawerLayout; import java.util.ArrayList; diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index ef725da1e463b..a94f30867e400 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -19,7 +19,7 @@ import android.content.Context; import android.os.Build; import android.view.View; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; /** * Log all the things. diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index 0474df7bd89cb..d12417b47fec1 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -34,7 +34,7 @@ import android.view.ViewConfiguration; import android.widget.Button; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.IccCardConstants.State; import com.android.internal.widget.LockPatternUtils; import com.android.internal.policy.EmergencyAffordanceManager; diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java index 1bebebc6fda05..7b0a291e22598 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java @@ -48,7 +48,7 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.printspooler.R; import java.text.Collator; diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 23c6615e4715c..4b519171b3eb1 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -88,7 +88,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.printspooler.R; import com.android.printspooler.model.MutexFileProvider; import com.android.printspooler.model.PrintSpoolerProvider; diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java index 74582f3da2031..6f0caa244281b 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java @@ -63,7 +63,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.printspooler.R; import java.util.ArrayList; diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java index 381f903a97016..c3acf0b03ab5e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java @@ -35,7 +35,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.net.URISyntaxException; import java.util.Locale; diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 772c344fbfdbd..dedb9ac8c51db 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -44,7 +44,7 @@ import libcore.io.Streams; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.google.android.collect.Lists; diff --git a/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java b/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java index b1f454e5e3d08..965ded5beaffd 100644 --- a/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java +++ b/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java @@ -35,8 +35,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.PhoneEvent; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session.PhoneEvent; /** * Tracks touch, sensor and phone events when the lockscreen is on. If the phone is unlocked diff --git a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java index b39803a01783f..f8b73a1725168 100644 --- a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java +++ b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java @@ -22,10 +22,10 @@ import android.view.MotionEvent; import java.util.ArrayList; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.PhoneEvent; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.SensorEvent; -import static com.android.systemui.statusbar.phone.TouchAnalyticsProto.Session.TouchEvent; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session.PhoneEvent; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session.SensorEvent; +import static com.android.systemui.statusbar.phone.nano.TouchAnalyticsProto.Session.TouchEvent; /** * Collects touch, sensor and phone events and converts the data to diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index bb4ea2d7ee02b..9cc927d1fb3a9 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -34,7 +34,7 @@ import android.util.Log; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.statusbar.phone.DozeParameters; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index c699e275ac115..49307d80f1394 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -28,7 +28,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 39ce324365a70..6856575ad9c16 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -29,7 +29,7 @@ import android.util.Log; import android.util.SparseArray; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; import com.android.systemui.qs.QSTile.State; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index cf2c16dd86643..f663c751ebf50 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -35,7 +35,7 @@ import android.widget.Toolbar; import android.widget.Toolbar.OnMenuItemClickListener; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer; import com.android.systemui.qs.QSDetailClipper; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index 8d7f6ee728507..f2c3e61cfe02f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -40,7 +40,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.R; import com.android.systemui.qs.QSIconView; import com.android.systemui.qs.customize.TileAdapter.Holder; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index dc68112c6bbcc..28530d7b0cfb3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -37,7 +37,7 @@ import android.view.IWindowManager; import android.view.WindowManager; import android.view.WindowManagerGlobal; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java index a980a7f874052..e57cd58fe8fe9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java @@ -26,7 +26,7 @@ import android.provider.Settings.Global; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.GlobalSetting; import com.android.systemui.qs.QSTile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java index d89fbfd3c8dfa..e5a555ac6942c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java @@ -35,7 +35,7 @@ import android.widget.Button; import android.widget.Checkable; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.BatteryInfo; import com.android.settingslib.graph.UsageView; import com.android.systemui.BatteryMeterDrawable; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 18bde27fc6b4e..53010afceaf08 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -29,7 +29,7 @@ import android.widget.Button; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 61bad771b6e01..4abd84a64517e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.Button; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; import com.android.systemui.qs.QSDetailItems; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 7de883e2505d9..2183565502f38 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.Button; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.net.DataUsageController; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 5ae7a767aaeac..77f063dfc2ebe 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -22,7 +22,7 @@ import android.provider.Settings.Secure; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.SecureSetting; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index aabafe162f0ce..0ff81e5f8e52a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -19,7 +19,7 @@ import android.content.Intent; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.qs.QSTile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index ec4ab51e0d1e6..544ee910c228a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -33,7 +33,7 @@ import android.widget.Switch; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.SysUIToast; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index 0aa723edfb319..8fdce65b19737 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -25,7 +25,7 @@ import android.text.style.ForegroundColorSpan; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.FlashlightController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 016c4b70f485c..b888fc866bb5d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -29,7 +29,7 @@ import android.text.style.ForegroundColorSpan; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.GlobalSetting; import com.android.systemui.qs.QSTile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java index 2a2cc46cb98cc..f9688169d7959 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java @@ -30,7 +30,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.qs.QSTile; import java.util.Arrays; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index 5b5ecae3d423c..4b890754eb848 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.KeyguardMonitor; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index c02e5aee9ccf6..10fde3042ce47 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -23,7 +23,7 @@ import android.widget.Switch; import com.android.internal.app.NightDisplayController; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 499eb50e9992a..eb4c5109f2536 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -24,7 +24,7 @@ import android.provider.Settings; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.RotationLockController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java index cd09231ca002f..91d38bd075bf8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.R; import com.android.systemui.qs.PseudoGridView; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java index b5fbfe05d3680..e79e51916a982 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java @@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable; import android.provider.Settings; import android.util.Pair; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.UserInfoController; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 27306fcfcd00b..9ce748f69e1cb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -28,7 +28,7 @@ import android.widget.Button; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.wifi.AccessPoint; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSContainer.DetailAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 459e8ece569e0..ce7fbd368cba9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -21,7 +21,7 @@ import android.provider.Settings; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.phone.ManagedProfileController; diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index e203c2f044f59..7655e6cee85b3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -41,7 +41,7 @@ import android.view.Display; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.EventLogConstants; import com.android.systemui.EventLogTags; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index ec99d20ffdb39..af1823c88da0a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -40,7 +40,7 @@ import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.DejankUtils; import com.android.systemui.Interpolators; import com.android.keyguard.LatencyTracker; diff --git a/packages/SystemUI/src/com/android/systemui/recents/grid/RecentsGridActivity.java b/packages/SystemUI/src/com/android/systemui/recents/grid/RecentsGridActivity.java index 96644b5839741..b88ee7672cfae 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/grid/RecentsGridActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/grid/RecentsGridActivity.java @@ -31,7 +31,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsActivity; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index febeacb3bcf0a..3c7012a16dfc4 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -43,7 +43,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.recents.Recents; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 936354e98998e..77c61f8bc5260 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -47,7 +47,7 @@ import android.widget.FrameLayout; import android.widget.ScrollView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.recents.Recents; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java index d44aa844003f0..71f559be67753 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java @@ -34,7 +34,7 @@ import android.view.ViewParent; import android.view.animation.Interpolator; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.SwipeHelper; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 14f545e718c96..56aabb5670a41 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -39,7 +39,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.recents.Recents; diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index 3ed26984c809c..e8039c35bb4fc 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -33,7 +33,7 @@ import android.provider.Settings; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java index 803fe4809322b..901d47d6cde8b 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java @@ -25,7 +25,7 @@ import android.view.WindowManager; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; /** A dialog that provides controls for adjusting the screen brightness. */ diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java index 15d26f9a7a0cd..2684722a9d842 100644 --- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java @@ -35,7 +35,7 @@ import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityManager; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.DividerSnapAlgorithm; import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 4e34bbc11453e..47d2def0cf63f 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -54,7 +54,7 @@ import android.view.animation.PathInterpolator; import android.widget.FrameLayout; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.DividerSnapAlgorithm; import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget; import com.android.internal.policy.DockedDividerUtils; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 23acb1b1ce41b..93ddd177c2703 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -87,7 +87,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.widget.LockPatternUtils; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index caf5447d9d261..5173176ffa8f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -43,7 +43,7 @@ import android.widget.Chronometer; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.NotificationColorUtil; import com.android.systemui.R; import com.android.systemui.classifier.FalsingManager; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index f4387629b8b31..f43fc4065766e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -59,7 +59,7 @@ import android.widget.TextView; import com.android.internal.app.AssistUtils; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.recents.Recents; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index b10fb3133d984..bb327eff5c40e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -43,7 +43,7 @@ import android.widget.SeekBar; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.Utils; import com.android.systemui.Interpolators; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java index 0f800bb61de73..228e8ea843b54 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java @@ -27,7 +27,7 @@ import android.view.View; import android.view.ViewConfiguration; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget; import com.android.systemui.R; import com.android.systemui.RecentsComponent; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index c33d91a9a29de..a9aa2edd1780a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -118,7 +118,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.StatusBarIcon; import com.android.keyguard.KeyguardHostView.OnDismissAction; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index a8b0122a94706..65c634727293b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -33,7 +33,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.keyguard.KeyguardStatusView; import com.android.systemui.FontSizeUtils; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 7b1f7071b5c7e..44ec2831dd9b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -50,7 +50,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.statusbar.ExpandableView; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 30d1c54b40966..eda46c55bf742 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -48,7 +48,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.UserIcons; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.GuestResumeSessionReceiver; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index da58d9e98a6b5..72a0e5929a175 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -57,7 +57,7 @@ import android.widget.OverScroller; import android.widget.ScrollView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.ExpandHelper; import com.android.systemui.Interpolators; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java index 6e08139267ef0..9998283e1a051 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java @@ -21,7 +21,7 @@ import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.statusbar.phone.StatusBarIconController; import static com.android.systemui.BatteryMeterDrawable.SHOW_PERCENT_SETTING; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java index 0a3197c039cf8..0a962f1f2519d 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java @@ -31,7 +31,7 @@ import android.support.v7.preference.PreferenceScreen; import android.view.MenuItem; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.DemoMode; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java index 14fccf21af430..8740a3c2f45a2 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/PowerNotificationControlsFragment.java @@ -16,7 +16,7 @@ package com.android.systemui.tuner; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import android.annotation.Nullable; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java index f2f0382060c7d..dea2f5060c3ab 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java @@ -24,7 +24,7 @@ import android.text.TextUtils; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.tuner.TunerService.Tunable; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java index 7f63418de3244..fd6500fd1eec8 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java @@ -27,7 +27,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.plugins.PluginPrefs; diff --git a/packages/SystemUI/src/com/android/systemui/volume/Events.java b/packages/SystemUI/src/com/android/systemui/volume/Events.java index 8e0f9b88af3ef..ca53bc4f7928b 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/Events.java +++ b/packages/SystemUI/src/com/android/systemui/volume/Events.java @@ -23,7 +23,7 @@ import android.provider.Settings.Global; import android.util.Log; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.volume.VolumeDialogController.State; import java.util.Arrays; diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 22d130941f472..87f6138da15d5 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -52,7 +52,7 @@ import android.widget.RadioGroup; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.statusbar.policy.ZenModeController; diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 553cb071613bb..830a6ed23f9cc 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -40,7 +40,7 @@ import android.util.Slog; import android.view.KeyEvent; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.statusbar.StatusBarManagerInternal; /** diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java index be8f21d997a5d..facfeb67b6530 100644 --- a/services/core/java/com/android/server/am/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/am/ActivityMetricsLogger.java @@ -16,7 +16,7 @@ import android.os.SystemClock; import android.util.Slog; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index c19a5710666b7..7a122e6e6d20b 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -18,7 +18,7 @@ package com.android.server.am; import com.android.internal.app.ProcessMap; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.ProcessCpuTracker; import com.android.server.Watchdog; diff --git a/services/core/java/com/android/server/am/AppNotRespondingDialog.java b/services/core/java/com/android/server/am/AppNotRespondingDialog.java index c6befd7fbb7aa..9e297255c2f9c 100644 --- a/services/core/java/com/android/server/am/AppNotRespondingDialog.java +++ b/services/core/java/com/android/server/am/AppNotRespondingDialog.java @@ -17,7 +17,7 @@ package com.android.server.am; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import android.content.ActivityNotFoundException; import android.content.Context; diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java b/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java index f1d01e06911a2..372b2d8e566e4 100644 --- a/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java +++ b/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java @@ -29,14 +29,14 @@ import android.net.metrics.NetworkEvent; import android.net.metrics.RaEvent; import android.net.metrics.ValidationProbeEvent; import android.os.Parcelable; -import com.android.server.connectivity.metrics.IpConnectivityLogClass; +import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityEvent; -import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityLog; -import static com.android.server.connectivity.metrics.IpConnectivityLogClass.NetworkId; +import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; +import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityLog; +import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.NetworkId; /** {@hide} */ final public class IpConnectivityEventBuilder { @@ -136,96 +136,107 @@ final public class IpConnectivityEventBuilder { } private static void setDhcpErrorEvent(IpConnectivityEvent out, DhcpErrorEvent in) { - out.dhcpEvent = new IpConnectivityLogClass.DHCPEvent(); - out.dhcpEvent.ifName = in.ifName; - out.dhcpEvent.errorCode = in.errorCode; + IpConnectivityLogClass.DHCPEvent dhcpEvent = new IpConnectivityLogClass.DHCPEvent(); + dhcpEvent.ifName = in.ifName; + dhcpEvent.setErrorCode(in.errorCode); + out.setDhcpEvent(dhcpEvent); } private static void setDhcpClientEvent(IpConnectivityEvent out, DhcpClientEvent in) { - out.dhcpEvent = new IpConnectivityLogClass.DHCPEvent(); - out.dhcpEvent.ifName = in.ifName; - out.dhcpEvent.stateTransition = in.msg; - out.dhcpEvent.durationMs = in.durationMs; + IpConnectivityLogClass.DHCPEvent dhcpEvent = new IpConnectivityLogClass.DHCPEvent(); + dhcpEvent.ifName = in.ifName; + dhcpEvent.setStateTransition(in.msg); + dhcpEvent.durationMs = in.durationMs; + out.setDhcpEvent(dhcpEvent); } private static void setDnsEvent(IpConnectivityEvent out, DnsEvent in) { - out.dnsLookupBatch = new IpConnectivityLogClass.DNSLookupBatch(); - out.dnsLookupBatch.networkId = netIdOf(in.netId); - out.dnsLookupBatch.eventTypes = bytesToInts(in.eventTypes); - out.dnsLookupBatch.returnCodes = bytesToInts(in.returnCodes); - out.dnsLookupBatch.latenciesMs = in.latenciesMs; + IpConnectivityLogClass.DNSLookupBatch dnsLookupBatch = new IpConnectivityLogClass.DNSLookupBatch(); + dnsLookupBatch.networkId = netIdOf(in.netId); + dnsLookupBatch.eventTypes = bytesToInts(in.eventTypes); + dnsLookupBatch.returnCodes = bytesToInts(in.returnCodes); + dnsLookupBatch.latenciesMs = in.latenciesMs; + out.setDnsLookupBatch(dnsLookupBatch); } private static void setIpManagerEvent(IpConnectivityEvent out, IpManagerEvent in) { - out.ipProvisioningEvent = new IpConnectivityLogClass.IpProvisioningEvent(); - out.ipProvisioningEvent.ifName = in.ifName; - out.ipProvisioningEvent.eventType = in.eventType; - out.ipProvisioningEvent.latencyMs = (int) in.durationMs; + IpConnectivityLogClass.IpProvisioningEvent ipProvisioningEvent = new IpConnectivityLogClass.IpProvisioningEvent(); + ipProvisioningEvent.ifName = in.ifName; + ipProvisioningEvent.eventType = in.eventType; + ipProvisioningEvent.latencyMs = (int) in.durationMs; + out.setIpProvisioningEvent(ipProvisioningEvent); } private static void setIpReachabilityEvent(IpConnectivityEvent out, IpReachabilityEvent in) { - out.ipReachabilityEvent = new IpConnectivityLogClass.IpReachabilityEvent(); - out.ipReachabilityEvent.ifName = in.ifName; - out.ipReachabilityEvent.eventType = in.eventType; + IpConnectivityLogClass.IpReachabilityEvent ipReachabilityEvent = new IpConnectivityLogClass.IpReachabilityEvent(); + ipReachabilityEvent.ifName = in.ifName; + ipReachabilityEvent.eventType = in.eventType; + out.setIpReachabilityEvent(ipReachabilityEvent); } private static void setDefaultNetworkEvent(IpConnectivityEvent out, DefaultNetworkEvent in) { - out.defaultNetworkEvent = new IpConnectivityLogClass.DefaultNetworkEvent(); - out.defaultNetworkEvent.networkId = netIdOf(in.netId); - out.defaultNetworkEvent.previousNetworkId = netIdOf(in.prevNetId); - out.defaultNetworkEvent.transportTypes = in.transportTypes; - out.defaultNetworkEvent.previousNetworkIpSupport = ipSupportOf(in); + IpConnectivityLogClass.DefaultNetworkEvent defaultNetworkEvent = new IpConnectivityLogClass.DefaultNetworkEvent(); + defaultNetworkEvent.networkId = netIdOf(in.netId); + defaultNetworkEvent.previousNetworkId = netIdOf(in.prevNetId); + defaultNetworkEvent.transportTypes = in.transportTypes; + defaultNetworkEvent.previousNetworkIpSupport = ipSupportOf(in); + out.setDefaultNetworkEvent(defaultNetworkEvent); } private static void setNetworkEvent(IpConnectivityEvent out, NetworkEvent in) { - out.networkEvent = new IpConnectivityLogClass.NetworkEvent(); - out.networkEvent.networkId = netIdOf(in.netId); - out.networkEvent.eventType = in.eventType; - out.networkEvent.latencyMs = (int) in.durationMs; + IpConnectivityLogClass.NetworkEvent networkEvent = new IpConnectivityLogClass.NetworkEvent(); + networkEvent.networkId = netIdOf(in.netId); + networkEvent.eventType = in.eventType; + networkEvent.latencyMs = (int) in.durationMs; + out.setNetworkEvent(networkEvent); } private static void setValidationProbeEvent(IpConnectivityEvent out, ValidationProbeEvent in) { - out.validationProbeEvent = new IpConnectivityLogClass.ValidationProbeEvent(); - out.validationProbeEvent.networkId = netIdOf(in.netId); - out.validationProbeEvent.latencyMs = (int) in.durationMs; - out.validationProbeEvent.probeType = in.probeType; - out.validationProbeEvent.probeResult = in.returnCode; + IpConnectivityLogClass.ValidationProbeEvent validationProbeEvent = new IpConnectivityLogClass.ValidationProbeEvent(); + validationProbeEvent.networkId = netIdOf(in.netId); + validationProbeEvent.latencyMs = (int) in.durationMs; + validationProbeEvent.probeType = in.probeType; + validationProbeEvent.probeResult = in.returnCode; + out.setValidationProbeEvent(validationProbeEvent); } private static void setApfProgramEvent(IpConnectivityEvent out, ApfProgramEvent in) { - out.apfProgramEvent = new IpConnectivityLogClass.ApfProgramEvent(); - out.apfProgramEvent.lifetime = in.lifetime; - out.apfProgramEvent.filteredRas = in.filteredRas; - out.apfProgramEvent.currentRas = in.currentRas; - out.apfProgramEvent.programLength = in.programLength; + IpConnectivityLogClass.ApfProgramEvent apfProgramEvent = new IpConnectivityLogClass.ApfProgramEvent(); + apfProgramEvent.lifetime = in.lifetime; + apfProgramEvent.filteredRas = in.filteredRas; + apfProgramEvent.currentRas = in.currentRas; + apfProgramEvent.programLength = in.programLength; if (isBitSet(in.flags, ApfProgramEvent.FLAG_MULTICAST_FILTER_ON)) { - out.apfProgramEvent.dropMulticast = true; + apfProgramEvent.dropMulticast = true; } if (isBitSet(in.flags, ApfProgramEvent.FLAG_HAS_IPV4_ADDRESS)) { - out.apfProgramEvent.hasIpv4Addr = true; + apfProgramEvent.hasIpv4Addr = true; } + out.setApfProgramEvent(apfProgramEvent); } private static void setApfStats(IpConnectivityEvent out, ApfStats in) { - out.apfStatistics = new IpConnectivityLogClass.ApfStatistics(); - out.apfStatistics.durationMs = in.durationMs; - out.apfStatistics.receivedRas = in.receivedRas; - out.apfStatistics.matchingRas = in.matchingRas; - out.apfStatistics.droppedRas = in.droppedRas; - out.apfStatistics.zeroLifetimeRas = in.zeroLifetimeRas; - out.apfStatistics.parseErrors = in.parseErrors; - out.apfStatistics.programUpdates = in.programUpdates; - out.apfStatistics.maxProgramSize = in.maxProgramSize; + IpConnectivityLogClass.ApfStatistics apfStatistics = new IpConnectivityLogClass.ApfStatistics(); + apfStatistics.durationMs = in.durationMs; + apfStatistics.receivedRas = in.receivedRas; + apfStatistics.matchingRas = in.matchingRas; + apfStatistics.droppedRas = in.droppedRas; + apfStatistics.zeroLifetimeRas = in.zeroLifetimeRas; + apfStatistics.parseErrors = in.parseErrors; + apfStatistics.programUpdates = in.programUpdates; + apfStatistics.maxProgramSize = in.maxProgramSize; + out.setApfStatistics(apfStatistics); } private static void setRaEvent(IpConnectivityEvent out, RaEvent in) { - out.raEvent = new IpConnectivityLogClass.RaEvent(); - out.raEvent.routerLifetime = in.routerLifetime; - out.raEvent.prefixValidLifetime = in.prefixValidLifetime; - out.raEvent.prefixPreferredLifetime = in.prefixPreferredLifetime; - out.raEvent.routeInfoLifetime = in.routeInfoLifetime; - out.raEvent.rdnssLifetime = in.rdnssLifetime; - out.raEvent.dnsslLifetime = in.dnsslLifetime; + IpConnectivityLogClass.RaEvent raEvent = new IpConnectivityLogClass.RaEvent(); + raEvent.routerLifetime = in.routerLifetime; + raEvent.prefixValidLifetime = in.prefixValidLifetime; + raEvent.prefixPreferredLifetime = in.prefixPreferredLifetime; + raEvent.routeInfoLifetime = in.routeInfoLifetime; + raEvent.rdnssLifetime = in.rdnssLifetime; + raEvent.dnsslLifetime = in.dnsslLifetime; + out.setRaEvent(raEvent); } private static int[] bytesToInts(byte[] in) { diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java index 641c62fe2a4d7..42f439c242f8f 100644 --- a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java +++ b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java @@ -42,7 +42,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.function.ToIntFunction; -import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityEvent; +import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; /** {@hide} */ final public class IpConnectivityMetrics extends SystemService { diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java index 393199dd6183e..fbad8dede87d6 100644 --- a/services/core/java/com/android/server/dreams/DreamController.java +++ b/services/core/java/com/android/server/dreams/DreamController.java @@ -17,7 +17,7 @@ package com.android.server.dreams; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.content.ComponentName; import android.content.Context; diff --git a/services/core/java/com/android/server/fingerprint/AuthenticationClient.java b/services/core/java/com/android/server/fingerprint/AuthenticationClient.java index 5297589c47953..d65e25785e392 100644 --- a/services/core/java/com/android/server/fingerprint/AuthenticationClient.java +++ b/services/core/java/com/android/server/fingerprint/AuthenticationClient.java @@ -17,7 +17,7 @@ package com.android.server.fingerprint; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.content.Context; import android.hardware.fingerprint.Fingerprint; diff --git a/services/core/java/com/android/server/fingerprint/EnrollClient.java b/services/core/java/com/android/server/fingerprint/EnrollClient.java index 640a46fb656f0..c70ca7f5b28b5 100644 --- a/services/core/java/com/android/server/fingerprint/EnrollClient.java +++ b/services/core/java/com/android/server/fingerprint/EnrollClient.java @@ -25,7 +25,7 @@ import android.os.RemoteException; import android.util.Slog; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.Arrays; diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index a8bd4d289616d..3bea663c6700a 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -19,7 +19,7 @@ package com.android.server.policy; import com.android.internal.app.AlertController; import com.android.internal.app.AlertController.AlertParams; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.EmergencyAffordanceManager; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 0ea8d4e5101dd..7f8b9b814533a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -22,7 +22,7 @@ import static android.app.admin.DevicePolicyManager.WIPE_EXTERNAL_STORAGE; import static android.app.admin.DevicePolicyManager.WIPE_RESET_PROTECTION_DATA; import static android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES; -import static com.android.internal.logging.MetricsProto.MetricsEvent.PROVISIONING_ENTRY_POINT_ADB; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PROVISIONING_ENTRY_POINT_ADB; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW; import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import static org.xmlpull.v1.XmlPullParser.END_TAG; diff --git a/services/print/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java index 65c740f9ca3ef..7474a64c32cb7 100644 --- a/services/print/java/com/android/server/print/UserState.java +++ b/services/print/java/com/android/server/print/UserState.java @@ -68,7 +68,7 @@ import android.util.SparseArray; import com.android.internal.R; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BackgroundThread; import com.android.internal.os.SomeArgs; import com.android.server.print.RemotePrintService.PrintServiceCallbacks; diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index 6ff0c5a8595e8..6a064d271bcc4 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -25,7 +25,7 @@ import static com.android.server.connectivity.MetricsTestUtil.anInt; import static com.android.server.connectivity.MetricsTestUtil.anIntArray; import static com.android.server.connectivity.MetricsTestUtil.b; import static com.android.server.connectivity.MetricsTestUtil.describeIpEvent; -import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityLog; +import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityLog; import android.net.ConnectivityMetricsEvent; import android.net.metrics.ApfProgramEvent; diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index c7982b1a1f393..78d16d93287ec 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -34,7 +34,7 @@ import android.net.metrics.ValidationProbeEvent; import android.os.Parcelable; import android.util.Base64; -import com.android.server.connectivity.metrics.IpConnectivityLogClass; +import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass; import junit.framework.TestCase; diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/compile/Compile.cpp index a06140cff5422..f0b18e65cc1a0 100644 --- a/tools/aapt2/compile/Compile.cpp +++ b/tools/aapt2/compile/Compile.cpp @@ -482,7 +482,9 @@ class BigBufferOutputStream : public io::OutputStream { void BackUp(int count) override { buffer_->BackUp(count); } - int64_t ByteCount() const override { return buffer_->size(); } + google::protobuf::int64 ByteCount() const override { + return buffer_->size(); + } bool HadError() const override { return false; } diff --git a/tools/aapt2/compile/Png.cpp b/tools/aapt2/compile/Png.cpp index f1bc53ee9cf75..7ab05b58b8b94 100644 --- a/tools/aapt2/compile/Png.cpp +++ b/tools/aapt2/compile/Png.cpp @@ -232,6 +232,13 @@ PNG_COLOR_TYPE_RGB_ALPHA) { } }*/ +#ifdef MAX +#undef MAX +#endif +#ifdef ABS +#undef ABS +#endif + #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define ABS(a) ((a) < 0 ? -(a) : (a)) diff --git a/tools/aapt2/compile/Png.h b/tools/aapt2/compile/Png.h index 01c9adbc90942..aff1da3f05d2d 100644 --- a/tools/aapt2/compile/Png.h +++ b/tools/aapt2/compile/Png.h @@ -62,8 +62,8 @@ class PngChunkFilter : public io::InputStream { void BackUp(int count) override; bool Skip(int count) override; - int64_t ByteCount() const override { - return static_cast(window_start_); + google::protobuf::int64 ByteCount() const override { + return static_cast(window_start_); } bool HadError() const override { return error_; } diff --git a/tools/aapt2/proto/TableProtoSerializer.cpp b/tools/aapt2/proto/TableProtoSerializer.cpp index 68db6b333bdc6..0d0e46da4ec8e 100644 --- a/tools/aapt2/proto/TableProtoSerializer.cpp +++ b/tools/aapt2/proto/TableProtoSerializer.cpp @@ -361,7 +361,7 @@ bool CompiledFileInputStream::ReadLittleEndian32(uint32_t* out_val) { bool CompiledFileInputStream::ReadCompiledFile(pb::CompiledFile* out_val) { EnsureAlignedRead(); - uint64_t pb_size = 0u; + google::protobuf::uint64 pb_size = 0u; if (!in_.ReadLittleEndian64(&pb_size)) { return false; } @@ -389,7 +389,7 @@ bool CompiledFileInputStream::ReadDataMetaData(uint64_t* out_offset, uint64_t* out_len) { EnsureAlignedRead(); - uint64_t pb_size = 0u; + google::protobuf::uint64 pb_size = 0u; if (!in_.ReadLittleEndian64(&pb_size)) { return false; }