Use non-internal annotations.

Eventually we want to make the PackageInstaller to use only system-api,
not internal apis anymore. This changes some trivial annotations to
their external equivalent.

Test: Built
Change-Id: I73bf5a937e45d8b3ebe780e909dc91603fcff8c7

14 files changed, 17 insertions, 23 deletions

diff --git a/src/com/android/packageinstaller/EventResultPersister.java b/src/com/android/packageinstaller/EventResultPersister.java
index da091b38..46afd87d 100644
--- a/src/com/android/packageinstaller/EventResultPersister.java
+++ b/src/com/android/packageinstaller/EventResultPersister.java
@@ -16,18 +16,17 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInstaller;
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AtomicFile;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.Xml;
 
-import com.android.internal.annotations.GuardedBy;
 import com.android.internal.util.FastXmlSerializer;
 import com.android.internal.util.XmlUtils;
 
@@ -60,23 +59,18 @@ class EventResultPersister {
     private final Object mLock = new Object();
 
     /** Currently stored but not yet called back results (install id -> status, status message) */
-    @GuardedBy("mLock")
     private final SparseArray<EventResult> mResults = new SparseArray<>();
 
     /** Currently registered, not called back observers (install id -> observer) */
-    @GuardedBy("mLock")
     private final SparseArray<EventResultObserver> mObservers = new SparseArray<>();
 
     /** Always increasing counter for install event ids */
-    @GuardedBy("mLock")
     private int mCounter;
 
     /** If a write that will persist the state is scheduled */
-    @GuardedBy("mLock")
     private boolean mIsPersistScheduled;
 
     /** If the state was changed while the data was being persisted */
-    @GuardedBy("mLock")
     private boolean mIsPersistingStateValid;
 
     /**
diff --git a/src/com/android/packageinstaller/InstallEventReceiver.java b/src/com/android/packageinstaller/InstallEventReceiver.java
index 42984ea4..2c3538fa 100644
--- a/src/com/android/packageinstaller/InstallEventReceiver.java
+++ b/src/com/android/packageinstaller/InstallEventReceiver.java
@@ -16,10 +16,10 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.NonNull;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.NonNull;
 
 import java.io.File;
 
diff --git a/src/com/android/packageinstaller/InstallFailed.java b/src/com/android/packageinstaller/InstallFailed.java
index 6081f028..b13cc126 100644
--- a/src/com/android/packageinstaller/InstallFailed.java
+++ b/src/com/android/packageinstaller/InstallFailed.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,6 +28,7 @@ import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
diff --git a/src/com/android/packageinstaller/InstallInstalling.java b/src/com/android/packageinstaller/InstallInstalling.java
index c27c67c0..1eea4954 100755
--- a/src/com/android/packageinstaller/InstallInstalling.java
+++ b/src/com/android/packageinstaller/InstallInstalling.java
@@ -18,7 +18,6 @@ package com.android.packageinstaller;
 
 import static android.content.pm.PackageInstaller.SessionParams.UID_UNKNOWN;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
@@ -29,6 +28,7 @@ import android.content.pm.PackageParser;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.ProgressBar;
diff --git a/src/com/android/packageinstaller/InstallStaging.java b/src/com/android/packageinstaller/InstallStaging.java
index 9dc888b8..cabb606b 100644
--- a/src/com/android/packageinstaller/InstallStaging.java
+++ b/src/com/android/packageinstaller/InstallStaging.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -28,6 +27,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import java.io.File;
diff --git a/src/com/android/packageinstaller/InstallStart.java b/src/com/android/packageinstaller/InstallStart.java
index 6b7bf190..44ad0cf1 100644
--- a/src/com/android/packageinstaller/InstallStart.java
+++ b/src/com/android/packageinstaller/InstallStart.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.ActivityManagerNative;
 import android.content.Intent;
@@ -26,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.VerificationParams;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 /**
diff --git a/src/com/android/packageinstaller/InstallSuccess.java b/src/com/android/packageinstaller/InstallSuccess.java
index 94f6b313..ce3612ca 100644
--- a/src/com/android/packageinstaller/InstallSuccess.java
+++ b/src/com/android/packageinstaller/InstallSuccess.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -25,6 +24,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.Button;
 
diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java
index 9cbfa4f5..d6052f05 100644
--- a/src/com/android/packageinstaller/PackageUtil.java
+++ b/src/com/android/packageinstaller/PackageUtil.java
@@ -17,8 +17,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -30,6 +28,8 @@ import android.content.res.AssetManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/com/android/packageinstaller/UninstallEventReceiver.java b/src/com/android/packageinstaller/UninstallEventReceiver.java
index 62e0b22a..7ffc7d92 100644
--- a/src/com/android/packageinstaller/UninstallEventReceiver.java
+++ b/src/com/android/packageinstaller/UninstallEventReceiver.java
@@ -16,10 +16,10 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.NonNull;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.NonNull;
 
 import java.io.File;
 
diff --git a/src/com/android/packageinstaller/UninstallFinish.java b/src/com/android/packageinstaller/UninstallFinish.java
index 2d057864..f590d104 100644
--- a/src/com/android/packageinstaller/UninstallFinish.java
+++ b/src/com/android/packageinstaller/UninstallFinish.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.NonNull;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -35,6 +34,7 @@ import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/src/com/android/packageinstaller/UninstallUninstalling.java b/src/com/android/packageinstaller/UninstallUninstalling.java
index 84da17db..0e1ce5b0 100644
--- a/src/com/android/packageinstaller/UninstallUninstalling.java
+++ b/src/com/android/packageinstaller/UninstallUninstalling.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.ActivityThread;
 import android.app.AlertDialog;
@@ -34,6 +33,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.support.annotation.Nullable;
 import android.widget.Toast;
 
 /**
diff --git a/src/com/android/packageinstaller/permission/ui/television/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/television/ManagePermissionsFragment.java
index 35f866de..1d206874 100644
--- a/src/com/android/packageinstaller/permission/ui/television/ManagePermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/ManagePermissionsFragment.java
@@ -15,13 +15,13 @@
  */
 package com.android.packageinstaller.permission.ui.television;
 
-import android.annotation.Nullable;
 import android.app.ActionBar;
 import android.app.FragmentTransaction;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
diff --git a/src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java b/src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java
index 6119f98c..d0112d17 100644
--- a/src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java
@@ -16,8 +16,8 @@
 
 package com.android.packageinstaller.permission.ui.television;
 
-import android.annotation.Nullable;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v17.leanback.widget.VerticalGridView;
 import android.support.v7.preference.PreferenceScreen;
@@ -29,7 +29,7 @@ import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
 import android.view.animation.AnimationUtils;
 import android.widget.TextView;
-import com.android.packageinstaller.DeviceUtils;
+
 import com.android.packageinstaller.R;
 
 public abstract class PermissionsFrameFragment extends PreferenceFragment {
diff --git a/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java b/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
index af6d9c58..772bb3dd 100644
--- a/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
+++ b/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
@@ -16,11 +16,11 @@
 
 package com.android.packageinstaller.television;
 
-import android.annotation.Nullable;
 import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;