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

Commit 74fa089b authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

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
parent 04056a84

src/com/android/packageinstaller/EventResultPersister.java

+2 −8
Original line number Diff line number Diff line
@@ -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;



    /**

src/com/android/packageinstaller/InstallEventReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/packageinstaller/InstallFailed.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/packageinstaller/InstallInstalling.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/packageinstaller/InstallStaging.java

+1 −1
Original line number Diff line number Diff line
@@ -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;