From 061267eee9ccf8e17ce1ab81e4f0845a5a49ae45 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 21 Jun 2019 11:16:45 -0700 Subject: updater_sample: Build SystemUpdaterSample as non-privileged app by default. Prior to the change, SystemUpdaterSample was built as privileged app. It must be installed along with the matching privapp-permissions whitelist change (as noted in updater_sample/README.md), otherwise would block device booting if installed unintentionally (e.g. with `mm` or `mmma`). This CL avoids putting the device in a bad state due to a sample app. Fixes: 135703777 Test: `lunch aosp_taimen-userdebug && m -j installclean && mmma -j bootable/recovery && m -j` Flash on device and boot successfully. Test: Run the tests per instructions in updater_sample/README.md. Change-Id: Ib8b587c77570f05f7db748fad84744fa45016aab --- updater_sample/Android.bp | 1 - updater_sample/README.md | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'updater_sample') diff --git a/updater_sample/Android.bp b/updater_sample/Android.bp index 845e07b70..a014248b0 100644 --- a/updater_sample/Android.bp +++ b/updater_sample/Android.bp @@ -15,7 +15,6 @@ android_app { name: "SystemUpdaterSample", sdk_version: "system_current", - privileged: true, srcs: ["src/**/*.java"], diff --git a/updater_sample/README.md b/updater_sample/README.md index 2070ebc21..2e12a2fb9 100644 --- a/updater_sample/README.md +++ b/updater_sample/README.md @@ -191,6 +191,8 @@ privileged system app, so it's granted the required permissions to access ``` to `frameworks/base/data/etc/privapp-permissions-platform.xml` +4. Add `privileged: true` to SystemUpdaterSample + [building rule](https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/updater_sample/Android.bp). 5. Build sample app `make -j SystemUpdaterSample`. 6. Build Android `make -j` 7. [Flash the device](https://source.android.com/setup/build/running) @@ -229,9 +231,9 @@ The commands are expected to be run from `$ANDROID_BUILD_TOP`. 1. Build `make -j SystemUpdaterSample` and `make -j SystemUpdaterSampleTests`. 2. Install app - `adb install $OUT/system/priv-app/SystemUpdaterSample/SystemUpdaterSample.apk` + `adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk` 3. Install tests - `adb install $OUT/testcases/SystemUpdaterSampleTests/SystemUpdaterSampleTests.apk` + `adb install $OUT/testcases/SystemUpdaterSampleTests/arm64/SystemUpdaterSampleTests.apk` 4. Run tests `adb shell am instrument -w com.example.android.systemupdatersample.tests/android.support.test.runner.AndroidJUnitRunner` 5. Run a test file -- cgit v1.2.3