OSDN Git Service

Fix a no-op uninstall being treated as a failure
authorNeil Fuller <nfuller@google.com>
Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)
committerNeil Fuller <nfuller@google.com>
Fri, 15 Sep 2017 12:52:18 +0000 (12:52 +0000)
commit249b2e35a9f134f49b5baf6b0f650f34c1a70820
treea55b9ce28528e6125ada1a620f014b7197a2f887
parent293e2f99550c02a07f326feafc4dc9fd60c76382
Fix a no-op uninstall being treated as a failure

Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.

Unit tests run with:

make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug: 65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit 8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
services/core/java/com/android/server/timezone/RulesManagerService.java
services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java