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

Commit 24d85533 authored by Tamas Berghammer's avatar Tamas Berghammer
Browse files

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" 

This reverts commit cbd3f0c5.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
parent cbd3f0c5

core/java/com/android/internal/app/ChooserActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import android.widget.BaseAdapter; 
import android.widget.ListView;

import com.android.internal.R;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.google.android.collect.Lists;



import java.io.File;

core/java/com/android/internal/app/ResolverActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import android.widget.TextView; 
import android.widget.Toast;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.logging.MetricsProto;

import com.android.internal.widget.ResolverDrawerLayout;



import java.util.ArrayList;

core/java/com/android/internal/logging/MetricsLogger.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import android.content.Context; 
import android.os.Build;

import android.view.View;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.MetricsProto.MetricsEvent;



/**

 * Log all the things.

packages/DocumentsUI/src/com/android/documentsui/Metrics.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.android.documentsui.model.RootInfo; 
import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.services.FileOperationService.OpType;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.MetricsProto.MetricsEvent;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

packages/Keyguard/src/com/android/keyguard/EmergencyButton.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.view.ViewConfiguration; 
import android.widget.Button;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.policy.EmergencyAffordanceManager;