diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:28:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:28:26 +0000 |
| commit | f6baabd613265634aa26792423013b0c7225f745 (patch) | |
| tree | 2639c3bc3692ef32eb3d5c98099abd42ade2a4c6 | |
| parent | a97c315d43b274ba8bd5df8c48cedaf8eb027451 (diff) | |
| parent | 4ebafcb6bef7ebf49232188abcca622f27ad3147 (diff) | |
| download | experimental-f6baabd613265634aa26792423013b0c7225f745.tar.gz | |
Snap for 4620899 from 4ebafcb6bef7ebf49232188abcca622f27ad3147 to pi-release
Change-Id: I4d8beb7ebbf4b8b9d47d450bf1edcbfaf86a86a5
| -rw-r--r-- | PermissionApp/Android.mk | 3 | ||||
| -rw-r--r-- | PermissionApp/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | PermissionApp/src/foo/bar/permission/PermissionActivity.java | 4 | ||||
| -rw-r--r-- | PrintApp/Android.mk | 1 | ||||
| -rw-r--r-- | PrintService/Android.mk | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/PermissionApp/Android.mk b/PermissionApp/Android.mk index 00170ca..1111750 100644 --- a/PermissionApp/Android.mk +++ b/PermissionApp/Android.mk @@ -2,12 +2,11 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PermissionApp -#LOCAL_CERTIFICATE := platform - include $(BUILD_PACKAGE) diff --git a/PermissionApp/AndroidManifest.xml b/PermissionApp/AndroidManifest.xml index 8f35b34..c47fb6c 100644 --- a/PermissionApp/AndroidManifest.xml +++ b/PermissionApp/AndroidManifest.xml @@ -3,7 +3,6 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22"/> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.WRITE_CONTACTS" /> diff --git a/PermissionApp/src/foo/bar/permission/PermissionActivity.java b/PermissionApp/src/foo/bar/permission/PermissionActivity.java index 529eccf..eb1d779 100644 --- a/PermissionApp/src/foo/bar/permission/PermissionActivity.java +++ b/PermissionApp/src/foo/bar/permission/PermissionActivity.java @@ -20,13 +20,9 @@ import android.Manifest; import android.app.Activity; import android.app.LoaderManager; import android.bluetooth.BluetoothDevice; -import android.companion.AssociationRequest; -import android.companion.BluetoothDeviceFilter; -import android.companion.BluetoothLEDeviceFilter; import android.companion.CompanionDeviceManager; import android.content.CursorLoader; import android.content.Intent; -import android.content.IntentSender; import android.content.Loader; import android.content.pm.PackageManager; import android.database.Cursor; diff --git a/PrintApp/Android.mk b/PrintApp/Android.mk index 81ab231..f09a7ea 100644 --- a/PrintApp/Android.mk +++ b/PrintApp/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/PrintService/Android.mk b/PrintService/Android.mk index 6d4ff7f..8581d35 100644 --- a/PrintService/Android.mk +++ b/PrintService/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) |