OSDN Git Service
Bill Yi [Sat, 16 Sep 2017 20:08:14 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
9a2468011f -s ours
am:
ff2ef3477f -s ours
Change-Id: I8d4b998707f586d0b1a6b93e8515d9dc44efd3be
Bill Yi [Sat, 16 Sep 2017 19:58:19 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
fc9d5e5764 -s ours
am:
ee7c521595 -s ours
Change-Id: I6c6611dc22b79ce04981a4a14284f96ca7f30b2a
Bill Yi [Sat, 16 Sep 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9a2468011f -s ours
Change-Id: I151617e795e41cadc3dbd7d97a065c1c5672d74a
Bryce Lee [Sat, 16 Sep 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev am:
af17d47351
am:
89c87991a3
Change-Id: Id1c906f9263d8ff9226469ba7d3c0d860909d738
TreeHugger Robot [Sat, 16 Sep 2017 19:48:53 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 19:47:33 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fc9d5e5764 -s ours
Change-Id: I5d22fdc3bd8914926c13cf0d0a832b1eedab6e36
Bryce Lee [Sat, 16 Sep 2017 19:42:38 +0000 (19:42 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
am:
af17d47351
Change-Id: I67a82290d737949a60a69d55aabacde51407a007
TreeHugger Robot [Sat, 16 Sep 2017 19:33:49 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:33:21 +0000 (19:33 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 11:46:45 +0000 (11:46 +0000)]
Merge "Fix InputMethodPreference.compareTo method"
Bill Yi [Sat, 16 Sep 2017 04:55:46 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic586e92feca951793fd3cb9a401093e57e05b015
Bill Yi [Sat, 16 Sep 2017 03:43:03 +0000 (20:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie76a52fa6f6c717d78db5f9c338b1fde5cc6b4ad
TreeHugger Robot [Sat, 16 Sep 2017 02:53:53 +0000 (02:53 +0000)]
Merge "Avoid spaces in the trace file names."
Felipe Leme [Sat, 16 Sep 2017 02:01:40 +0000 (02:01 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev am:
a8c2b36b33
am:
631b987234
Change-Id: Ic7a986486bc0e5a2e4cda86001b919e14aece214
Felipe Leme [Sat, 16 Sep 2017 01:53:46 +0000 (01:53 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
am:
a8c2b36b33
Change-Id: I771b71a9c189c7eeae30524bd155b5e4f94ad681
TreeHugger Robot [Sat, 16 Sep 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
gopinath [Sat, 16 Sep 2017 01:09:02 +0000 (18:09 -0700)]
Avoid spaces in the trace file names.
Having spaces in the trace file names introduces slashes in the
file names and not able to pull the file names with the slashes
from the device.So avoid having spaces while constructing the
trace file names.
Bug : b/
65737738
Change-Id: Ie1971566586f77d18b17722ce0e3cc9ef3ebfdd3
TreeHugger Robot [Sat, 16 Sep 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Adding ability to add configs via adb command-line. The input must be in serialized binary format. Also fixes small issue in build rule related to proto lib."
Lucas Dupin [Fri, 15 Sep 2017 23:30:52 +0000 (23:30 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev am:
4f65a35713
am:
c910573484
Change-Id: I507c2ab2a39df004ebca354fbee9a4150f9a818d
Lucas Dupin [Fri, 15 Sep 2017 23:23:48 +0000 (23:23 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
am:
4f65a35713
Change-Id: Ic77d657bef1e7336e1774395da26886e4840a03c
Lucas Dupin [Fri, 15 Sep 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
Felipe Leme [Fri, 15 Sep 2017 19:56:55 +0000 (12:56 -0700)]
Fixed size of autofill service icon on Save affordance.
Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65739885
Change-Id: Ic9efd7bbb853c28b2d869a609d21eff4e6ef6d2d
Jeff Sharkey [Fri, 15 Sep 2017 22:46:00 +0000 (22:46 +0000)]
Merge "Move long-running calls to async with listeners."
Bryce Lee [Fri, 15 Sep 2017 22:22:43 +0000 (15:22 -0700)]
Do not stop paused activity when sleeping.
This changelist removes logic added to stop a top level paused
activity when trying to sleep. Doing so delays sleep and leads to
double sleep requests on the client side as it will also try to
stop the activity on sleep.
Bug:
65457314
Test: manual
Change-Id: I252e2b968a537cf2d696972d6a65e43661875943
Selim Cinek [Fri, 15 Sep 2017 21:34:25 +0000 (21:34 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev am:
dd3b6c83c6
am:
f83e81117a
Change-Id: Ideb598d0c28ce8bb0b84913e4683dda453d522a6
Tim Zheng [Fri, 15 Sep 2017 21:28:14 +0000 (21:28 +0000)]
Merge "BackupManagerService uses BackupManagerConstants."
Selim Cinek [Fri, 15 Sep 2017 21:26:46 +0000 (21:26 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
am:
dd3b6c83c6
Change-Id: Ifd1e83f3400bd870d087c1a248bb74b305aa313f
Selim Cinek [Fri, 15 Sep 2017 21:20:44 +0000 (21:20 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
David Chen [Wed, 13 Sep 2017 22:53:39 +0000 (15:53 -0700)]
Adding ability to add configs via adb command-line. The input
must be in serialized binary format. Also fixes small issue
in build rule related to proto lib.
Test: Manually tested that ADB command works without crashing.
Change-Id: Iba2e677561ff500adb601a598f73e8a7b32540e5
Jeff Sharkey [Fri, 15 Sep 2017 18:57:59 +0000 (12:57 -0600)]
Move long-running calls to async with listeners.
Now that we're using Binder, we can have callers provide explicit
listeners for every request instead of trying to squeeze them all
into unsolicited socket events.
Move benchmarking to be async to avoid blocking other commands for
up to several minutes. Remove post-trim benchmarking flag, since
benchmarking now requires a separate callback. Will bring back in
a future CL.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: adb shell sm fstrim
Bug:
62201209,
13758960
Change-Id: I26f76c66734ac2fd0f64713b8ab9828430499019
TreeHugger Robot [Fri, 15 Sep 2017 20:15:35 +0000 (20:15 +0000)]
Merge "MediaPlayer: add notifyAt for TimeProvider"
Jan Althaus [Fri, 15 Sep 2017 20:01:23 +0000 (20:01 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev am:
0fe3b1aa13
am:
6ec03f7c1f -s ours
Change-Id: Id8bd1ae7fa2f02d4a787a126913dedf484967566
Tony Mak [Fri, 15 Sep 2017 19:51:23 +0000 (19:51 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev am:
72befffcbc
am:
c5145fa25a
Change-Id: I4d7c7fbd530d1cc05679cdc4b7c044efb9d0ba40
Jan Althaus [Fri, 15 Sep 2017 19:45:22 +0000 (19:45 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev
am:
0fe3b1aa13
Change-Id: I09186a100a8a10d6713ae79b71e56ba75c6ffecb
Tony Mak [Fri, 15 Sep 2017 19:40:43 +0000 (19:40 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
am:
72befffcbc
Change-Id: Id711312d9bf0c6fe22cf93a166e533d9acf97452
TreeHugger Robot [Fri, 15 Sep 2017 19:31:22 +0000 (19:31 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 19:30:46 +0000 (19:30 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
Tim Zheng [Fri, 15 Sep 2017 01:48:27 +0000 (18:48 -0700)]
BackupManagerService uses BackupManagerConstants.
This change update the backup manager service to use newly created
BackupManagerConstants for some configuration parameters.
This is part 2 of the change.
Test: Used 'adb logcat -b system' to verify the settings worked.
Bug:
63351792
Change-Id: Ia6c9a2afbbaf3481a742a67c48ce9995c1ce6483
Neil Fuller [Fri, 15 Sep 2017 18:31:18 +0000 (18:31 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev am:
b6ccff73dd -s ours
am:
154dc85234 -s ours
Change-Id: I4936b5f67ee6c5bfcdb0be40730cc54db5a01b50
Neil Fuller [Fri, 15 Sep 2017 18:26:00 +0000 (18:26 +0000)]
Fix a no-op uninstall being treated as a failure am:
249b2e35a9 -s ours
am:
5c0d75acad -s ours
Change-Id: I45d6a707d56965a7c087a6435d3cd266ae86d90c
Neil Fuller [Fri, 15 Sep 2017 18:18:55 +0000 (18:18 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
am:
b6ccff73dd -s ours
Change-Id: I511fcbb0542459aca589f4ab2315b01508bbe707
Neil Fuller [Fri, 15 Sep 2017 18:14:27 +0000 (18:14 +0000)]
Fix a no-op uninstall being treated as a failure
am:
249b2e35a9 -s ours
Change-Id: I83404a077882a823e5ff63b70f47bba9435e9f57
Jorim Jaggi [Fri, 15 Sep 2017 18:13:30 +0000 (18:13 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev am:
6d9d42f6aa
am:
41fe2539f3
Change-Id: I75229cf1b8aafc7c8a933a9d2c7c6d4ac19e68d4
Selim Cinek [Fri, 15 Sep 2017 00:09:25 +0000 (17:09 -0700)]
Increased the text size for colorized notifications
Increased the text sizes a bit to make them more prominent.
Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes:
35925915
Chris Tate [Fri, 15 Sep 2017 18:04:38 +0000 (18:04 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev am:
955bfb6e25
am:
a645aac5a7
Change-Id: If3cf6546dad093673b6e6fc234613c33d385fd19
Jorim Jaggi [Fri, 15 Sep 2017 18:02:50 +0000 (18:02 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev
am:
6d9d42f6aa
Change-Id: I983bb9c73c4cdb43aa0c6ef33748da2a68db0d28
Hall Liu [Fri, 15 Sep 2017 17:59:28 +0000 (17:59 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev am:
b9d2b56c61 -s ours
am:
c98bf2f7f4
Change-Id: I2145da40b5bd1bfb3afcbe191f3651767ccc870d
Neil Fuller [Fri, 15 Sep 2017 17:56:16 +0000 (17:56 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
Chris Tate [Fri, 15 Sep 2017 17:55:13 +0000 (17:55 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev
am:
955bfb6e25
Change-Id: Ibfe8cdef80d78bc6ac7b915e55c16b25d978ce8e
TreeHugger Robot [Fri, 15 Sep 2017 17:55:06 +0000 (17:55 +0000)]
Merge "Disable flaky test testRemoveContainer_deferRemoval"
Hall Liu [Fri, 15 Sep 2017 17:51:22 +0000 (17:51 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev
am:
b9d2b56c61 -s ours
Change-Id: I24d682a9c13a7b6e16bc2e265468947fbe8dd64a
TreeHugger Robot [Fri, 15 Sep 2017 17:50:51 +0000 (17:50 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev
Chris Tate [Fri, 15 Sep 2017 17:37:09 +0000 (17:37 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 17:17:38 +0000 (17:17 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev
* changes:
API council suggested edits, part 3
Apply suggested edits to the file-download API
Make changes to MBMS Streaming APIs per recommendations
Neil Fuller [Fri, 15 Sep 2017 17:11:06 +0000 (17:11 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd am:
1157a7196b am:
9c60a8d3f1
am:
c648403c44 -s ours
Change-Id: Ib0521406251e6dbc0d13dcf1f7bc164e88acd1e8
Adam Lesinski [Fri, 15 Sep 2017 17:04:01 +0000 (17:04 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev am:
e02983681a
am:
e33de76a16 -s ours
Change-Id: I3d7f06be3a8cb42eb90bb5f76dc0261a85f5d258
Neil Fuller [Fri, 15 Sep 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd am:
1157a7196b
am:
9c60a8d3f1
Change-Id: I39ad444c735b5c11954700d5ae2ceaf74f747c4a
Adam Lesinski [Fri, 15 Sep 2017 16:57:21 +0000 (16:57 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
am:
e02983681a
Change-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3
Tenghui Zhu [Fri, 15 Sep 2017 16:55:56 +0000 (16:55 +0000)]
Merge "Add systrace for VectorDrawable inflation and draw"
Neil Fuller [Fri, 15 Sep 2017 16:53:24 +0000 (16:53 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd
am:
1157a7196b
Change-Id: I9f8a65fcb375678dc1290c155ec2c755fb5bfd62
Tony Mak [Fri, 15 Sep 2017 16:41:43 +0000 (17:41 +0100)]
getInstalledDialerApplications should not count ForwardIntentToParent
Issues:
1. Work profile call is logged into work profile side even there
is no work profile dialer.
2. In Settings, "Android" is shown as the default work profile dialer.
Cause:
When are querying installed dialers in work profile,
getInstalledDialerApplications return android/ForwardIntentToParent
because we forward calls to personal side if work dialer
is absent. But apparently, ForwardIntentToParent is not an installed
dialer in work profile. So Settings shows "Android" as default work
dialer and Telecom wrongly think that we have work dialer and insert
calllog in to work profile side.
Solution:
Ignore cross profile resolver by checking targetUserId.
Test: Manual
1. Check Settings, no longer see "Android" is set as work dialer.
2. Make a phone call using work contacts, observed that the call
is inserted into persoonal side.
3. Make a phone call using personal side, observed that the call
is inserted into personal side.
BUG:
65672386
Change-Id: I13d4234ad1684f714e1b4d7704f2413d903a0179
Adam Lesinski [Fri, 15 Sep 2017 16:49:34 +0000 (16:49 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
* changes:
AAPT2: Bump to version 2.19
AAPT2: Fix issue with resource deduping
AAPT: Dump badging should pickup strings from the right package
AAPT2: Change the daemon mode to be line based
AAPT2: better error handling for daemon mode
AAPT2: Fix regression in Manifest.java permissions
AAPT2: Define intermediate compiled XML proto
AAPT2: Add a daemon mode
AAPT2: Fix mkdirs implementation
AAPT2: Change XmlDom to exclude Namespace as a node
AAPT2: Fix windows unicode path issues
AAPT2: Fix typo in Config parsing
AAPT2: Change proto format to reduce usage of StringPool
AAPT2: Add navigation type
AAPT2: Document Format.proto
Neil Fuller [Fri, 15 Sep 2017 16:47:07 +0000 (16:47 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
am:
fab8162abd
Change-Id: I6478c02a4f37f7346a58cd980c21980234c50fec
Treehugger Robot [Fri, 15 Sep 2017 16:38:38 +0000 (16:38 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
Jan Althaus [Thu, 14 Sep 2017 15:52:23 +0000 (17:52 +0200)]
New metrics fields for selection logs
Changes that affect logging:
- Switched to new category/actions/fields that are used exclusively by
selection logging.
- Action types are now logged in the tron type (the information that was
previously in the field could be derived from other fields).
- Entity types are now logged in the tron sub type.
- Delta time from previous event is now zero for first event (was time
since epoch).
- The smart select model version is now written for all events after
smart select has run. (i.e. better support for analysis based on
terminal events alone)
- Restoring the logging removed in ag/
2901629.
Internal only changes:
- Made debug statement conditional on DEBUG_LOG_ENABLED.
- Reduced logging tag length to fit into 23char limit.
Bug:
64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: If12daa2f206fb42be53587decbe2c4abfd689f41
Change-Id: Iec0f6cf1f9f2efdc8518133cf8551cd96b095ad8
Wei Jia [Thu, 14 Sep 2017 01:19:48 +0000 (18:19 -0700)]
MediaPlayer: add notifyAt for TimeProvider
Test: TimeProvider gets correct media time when playback rate is not 1.0
Bug:
65204641
Change-Id: I5020515415e14a2c37eec0d1ece511518b9239e7
Max Bires [Fri, 15 Sep 2017 15:56:11 +0000 (15:56 +0000)]
Merge "Adding extra rc commands to fix incidentd with respect to selinux"
TreeHugger Robot [Fri, 15 Sep 2017 15:54:59 +0000 (15:54 +0000)]
Merge "New metrics fields for selection logs"
Clara Bayarri [Fri, 15 Sep 2017 15:21:06 +0000 (15:21 +0000)]
Merge "Fix hint text updates in Extracted text mode"
Neil Fuller [Fri, 15 Sep 2017 14:13:33 +0000 (14:13 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev am:
293e2f9955 -s ours
am:
d2d6c257f1 -s ours
Change-Id: I7bb39f9597981c8167aa62053990c776ba09691f
Wale Ogunwale [Fri, 15 Sep 2017 14:11:45 +0000 (07:11 -0700)]
Disable flaky test testRemoveContainer_deferRemoval
Bug:
65379195
Test: bit FrameworksServicesTests:com.android.server.wm.StackWindowControllerTests
Change-Id: Iee3fde155c083a4c4abe2f90529b20d172b5c328
Yohei Yukawa [Fri, 15 Sep 2017 14:10:09 +0000 (14:10 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev am:
7bbe06231f
am:
c6e9e15b4f
Change-Id: I92dd5fd0d4771d99fd0932cfa2e709ac6e9ec8cb
Hall Liu [Fri, 15 Sep 2017 14:04:33 +0000 (14:04 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45 am:
4c4fb3bdfb am:
7fd9aa2654
am:
3715bced3a
Change-Id: Ie4dacc599a561e60f40e5ef26f03aa7ef19fbda8
Hall Liu [Fri, 15 Sep 2017 14:00:18 +0000 (14:00 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd am:
3934c475ce am:
febecb8218
am:
3e0f22f676
Change-Id: I4c10058445c1252447f2cd5889bb35f425efa468
Jiyong Park [Fri, 15 Sep 2017 13:56:46 +0000 (13:56 +0000)]
Merge "Merge "Fix missing null checking" into oc-mr1-dev am:
93d436f4bc" into oc-mr1-dev-plus-aosp
am:
2089f92625
Change-Id: Id44a81a44df376ebcaa9efd229b78328d8eaa5ac
Narayan Kamath [Fri, 15 Sep 2017 13:53:16 +0000 (13:53 +0000)]
Merge changes from topic "am-
37ab0897d803452791072eae772298af" into oc-mr1-dev-plus-aosp
am:
609495e298 -s ours
Change-Id: I82d29485a7d36021850b2e43068afd8671cc36ff
Kevin Hufnagle [Fri, 15 Sep 2017 13:49:36 +0000 (13:49 +0000)]
Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
531a955dba" into oc-mr1-dev-plus-aosp
am:
a210bf21ea
Change-Id: Ibe5ab4b576c3726c70651931606f513da8d88bb9
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
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)
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
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)
Jorim Jaggi [Fri, 15 Sep 2017 12:17:40 +0000 (14:17 +0200)]
Don't take invisible screenshots
This fixes a bug where we took a snapshot of a task while the
surface wasn't visible yet. The transition was set-up so the win
animator was already shown but translucency was set to 0, leading
that the snapshot is a black screen.
We fixed this by also checking whether the alpha is non-zero.
Fixes a bug where launching a Hangouts notification from the
lockscreen causes a black flicker. When we launch the activity,
the Hangouts activity is in the mClosingApps list, because it's
immediately hidden from the lockscreen, which means we try to take
a snapshot. Shortly after that we reopen the activity because
Keyguard is going away, so we try to reuse a snapshot.
Test: go/wm-smoke
Test: Open hangouts, close hangouts with back button, go to
Keyguard, receive message, launch notification
Change-Id: Iffc1db1a738800c90a2421a5f90174d647eb4440
Fixes:
65695379
Android Build Merger (Role) [Fri, 15 Sep 2017 11:49:50 +0000 (11:49 +0000)]
Merge "Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am:
cebe432650" into oc-mr1-dev-plus-aosp am:
7a9b7da051"
sergeyv [Fri, 15 Sep 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am:
cebe432650" into oc-mr1-dev-plus-aosp
am:
7a9b7da051
Change-Id: If0cad94709d037fd47a96870d7b4f56622e9131a
Android Build Merger (Role) [Fri, 15 Sep 2017 11:43:42 +0000 (11:43 +0000)]
Merge "Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6 am:
3aa179fabd am:
e22de0f23f am:
4df0b1590c"
Jakub Pawlowski [Fri, 15 Sep 2017 11:40:41 +0000 (11:40 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6 am:
3aa179fabd am:
e22de0f23f
am:
4df0b1590c
Change-Id: I5843f0f481071f795f7631dad50e9503d315434e
Android Build Merger (Role) [Fri, 15 Sep 2017 11:39:54 +0000 (11:39 +0000)]
Merge "Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev am:
2437f9f10c am:
87fcf18ac7"
Andreas Gampe [Fri, 15 Sep 2017 11:38:02 +0000 (11:38 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev am:
2437f9f10c
am:
87fcf18ac7
Change-Id: I59e26973945ca6dfa69743e70a141fd93c4465ed
Android Build Merger (Role) [Fri, 15 Sep 2017 11:37:34 +0000 (11:37 +0000)]
Merge "Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am:
982ee8e6c3 am:
2d7ef64f47"
Jean-Michel Trivi [Fri, 15 Sep 2017 11:35:33 +0000 (11:35 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am:
982ee8e6c3
am:
2d7ef64f47
Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36
Android Build Merger (Role) [Fri, 15 Sep 2017 11:35:08 +0000 (11:35 +0000)]
Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
677b6f5a7b am:
86ca0d2ad4"
Kevin Hufnagle [Fri, 15 Sep 2017 11:33:20 +0000 (11:33 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
677b6f5a7b
am:
86ca0d2ad4
Change-Id: I9d616a940eac9b25cb1b7b5d630dd6c4401594ae
Android Build Merger (Role) [Fri, 15 Sep 2017 11:32:47 +0000 (11:32 +0000)]
Merge "Merge "Do not animate icons when leaving AoD" into oc-mr1-dev am:
06dc14cabc am:
a6e4a02b7e"
Lucas Dupin [Fri, 15 Sep 2017 11:31:03 +0000 (11:31 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev am:
06dc14cabc
am:
a6e4a02b7e
Change-Id: I70ea8de8a19743859ca1226d7570db5fb1dfd03c
Android Build Merger (Role) [Fri, 15 Sep 2017 11:30:33 +0000 (11:30 +0000)]
Merge "Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev am:
33b1e1fe4d am:
f42bf5904b"
Matthew Ng [Fri, 15 Sep 2017 11:28:48 +0000 (11:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev am:
33b1e1fe4d
am:
f42bf5904b
Change-Id: I46cffe55224ee5c7c58f794d802db7251e213ee8
Android Build Merger (Role) [Fri, 15 Sep 2017 11:28:21 +0000 (11:28 +0000)]
Merge "Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev am:
03f8b068a9 am:
0acb9df191"
Matthew Ng [Fri, 15 Sep 2017 11:26:36 +0000 (11:26 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev am:
03f8b068a9
am:
0acb9df191
Change-Id: I27ce836328aad395c391b4ed21846abd6b3fa1bf
Android Build Merger (Role) [Fri, 15 Sep 2017 11:25:59 +0000 (11:25 +0000)]
Merge "Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev am:
8bba760b4f am:
cb68c2559c"
Beverly [Fri, 15 Sep 2017 11:24:14 +0000 (11:24 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev am:
8bba760b4f
am:
cb68c2559c
Change-Id: Id87da8f0e49ef8095a290ba2393c237c6a15cf48
Android Build Merger (Role) [Fri, 15 Sep 2017 11:23:43 +0000 (11:23 +0000)]
Merge "Merge "Show big text on AoD" into oc-mr1-dev am:
a4996f241f am:
c86252c1dc"
Lucas Dupin [Fri, 15 Sep 2017 11:21:33 +0000 (11:21 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev am:
a4996f241f
am:
c86252c1dc
Change-Id: I51d691cd2cec04cd9c0b979a87914e9b4cde49ce