Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated various apps under frameworks/base/packages/Shell to androidx

Browse Source 
Bug: 76692459
Test: make Shell
Change-Id: If11159cac1bd5aa61c46a346647b97a661abbf11
Merged-In: If11159cac1bd5aa61c46a346647b97a661abbf11
(cherry picked from commit e92135a6e9)
(cherry picked from commit 474df059db)
This commit is contained in:
KOUSHIK PANUGANTI
2018-04-23 17:31:10 -07:00
committed by Colin Cross
parent a14377a450
commit e0efaddbeb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Shell/Android.mk
View File

@@ -12,7 +12,8 @@ LOCAL_SRC_FILES += \
LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := Shell
LOCAL_PRIVATE_PLATFORM_APIS := true

2
packages/Shell/AndroidManifest.xml
View File

@@ -157,7 +157,7 @@
android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true">
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="com.android.shell"
android:grantUriPermissions="true"
android:exported="false">

2
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -88,7 +88,7 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.Vibrator;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Log;