OSDN Git Service
Ruina Liu [Mon, 18 Sep 2017 18:06:30 +0000 (18:06 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44 am:
8c65620d31
am:
311d031d22
Change-Id: I151f0dc74bfeca44db6aa0c428f8cfbb8b2d3891
Ruina Liu [Mon, 18 Sep 2017 18:00:58 +0000 (18:00 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44
am:
8c65620d31
Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
Ruina Liu [Mon, 18 Sep 2017 17:53:31 +0000 (17:53 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am:
ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Treehugger Robot [Mon, 18 Sep 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
Jason Monk [Mon, 18 Sep 2017 17:27:30 +0000 (17:27 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
am:
5b4b6bda2d
Change-Id: Id986f78ecc87693f0442534875d473c5a0fe16ab
Winson Chung [Mon, 18 Sep 2017 17:17:32 +0000 (17:17 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
am:
9448052132
Change-Id: I55bc3be04dc14c834f0e6ecd52954d36fad84569
TreeHugger Robot [Mon, 18 Sep 2017 17:13:25 +0000 (17:13 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
Winson Chung [Mon, 18 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 16:58:08 +0000 (16:58 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
am:
d96b0d1b47
Change-Id: Ia209d29b9bd71e4fde44cadf8c5c07c5967f6d47
TreeHugger Robot [Mon, 18 Sep 2017 16:47:40 +0000 (16:47 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001
Andrii Kulian [Mon, 18 Sep 2017 06:35:15 +0000 (06:35 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
am:
7a09f7ec9c
Change-Id: I97fb5d929215147d9512bc89f3fd55f528b84393
Andrii Kulian [Mon, 18 Sep 2017 06:25:46 +0000 (06:25 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
Bill Yi [Sun, 17 Sep 2017 22:26:21 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c3f81baeee -s ours
Change-Id: I4046d8802fbeae277932717571509c1e0d6537ca
Bill Yi [Sun, 17 Sep 2017 22:18:14 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
420ae05329 -s ours
Change-Id: I2e7ae35b30cdf2c3f8b047f279e385d1a961b6c6
TreeHugger Robot [Sat, 16 Sep 2017 20:52:54 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9b4683842d -s ours
Change-Id: I181876ca8f124875296af5c91d90788d44e6e690
Bill Yi [Sat, 16 Sep 2017 20:46:31 +0000 (20:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ba3347b48a -s ours
Change-Id: I51b7f30fb9f32d74eb4a5df4fa0b84da834510c1
Bill Yi [Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
adbd504f40 -s ours
Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1
Bill Yi [Sat, 16 Sep 2017 20:26:10 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4498012c8b -s ours
Change-Id: I250606ea6088f6deedd77aec93af2c615488ded7
Bill Yi [Sat, 16 Sep 2017 20:22:13 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
3231634e2b -s ours
Change-Id: Ied3dddf8b55950c972a22bb1f1c9f2ceb6063318
TreeHugger Robot [Sat, 16 Sep 2017 20:19:42 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:17:07 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e0b4672a4e -s ours
Change-Id: Ic055179f584322b0cfa1f4228ee418ecd17d3e32
Bill Yi [Sat, 16 Sep 2017 20:12:00 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
14a340ff61 -s ours
Change-Id: Ice521e238b961521fd240f13a9481c551fe4e6f2
Bill Yi [Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fa04d2e02a -s ours
Change-Id: Ifbf67ba7f1c928c2231ef56615a3e4a043fd93d2
TreeHugger Robot [Sat, 16 Sep 2017 20:05:22 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:02:32 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:01:58 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
22d6738d16 -s ours
Change-Id: Ic81940cfa222f3ac337e053d10338cfa9108ce54
TreeHugger Robot [Sat, 16 Sep 2017 20:01:27 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:00:33 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
TreeHugger Robot [Sat, 16 Sep 2017 19:53:46 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:50:26 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
Bill Yi [Sat, 16 Sep 2017 13:17:52 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ided02ec91e7a2f5aacd8e5c28201672d14fceea7
Bill Yi [Sat, 16 Sep 2017 12:57:19 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6dab1e6544868c0ac2e0e4029a969a216f4c9b4d
Bill Yi [Sat, 16 Sep 2017 06:57:48 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic2ce0ef69af1bfd9f4b8980b3079b9756f93763c
Bill Yi [Sat, 16 Sep 2017 06:50:17 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I431251ef3dc0930b820a108edc6b76f876639035
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 04:48:17 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I81c38a635544d1672a6cbd1dc9528d95ccdbd894
Bill Yi [Sat, 16 Sep 2017 04:40:45 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I3978b88537a89176a6926eab1c21e09ab169a2cc
Bill Yi [Sat, 16 Sep 2017 04:33:13 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib786e99af653b130f2547c8ed1e223f0ddbcf3c8
Bill Yi [Sat, 16 Sep 2017 04:18:28 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie25a5101373e7c24af943b998a27f6f02da62a34
Bill Yi [Sat, 16 Sep 2017 04:03:41 +0000 (21:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8d182fda9abf6a8c4f5bb4f62de78e61a5c3d627
Bill Yi [Sat, 16 Sep 2017 03:56:07 +0000 (20:56 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifdd0077f7516e9266a9f38ff474bc8f71cc7591b
Bill Yi [Sat, 16 Sep 2017 03:48:15 +0000 (20:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I61400c4699a3694bc91bc6672e7dc62a28545bcc
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
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
Winson Chung [Fri, 15 Sep 2017 22:52:11 +0000 (15:52 -0700)]
Add low-ram check for PiP support even if feature is enabled.
Bug:
65602088
Test: Can not enter PiP on low-ram devices
Change-Id: I526cf73788fb4c7298433bee5cb54711820f042b
Ruina Liu [Sat, 22 Jul 2017 10:41:48 +0000 (18:41 +0800)]
Fix extracting 32-bit uuid error via calling method uuidToBytes
A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.
Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
Felipe Leme [Fri, 15 Sep 2017 22:16:28 +0000 (15:16 -0700)]
Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc.
Test: mmm -j108 frameworks/base/:doc-comment-check-docs
Bug:
65751159
Change-Id: Ie60b1f32e4d9acc675c6e25b7d3e606049b6a3c3
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
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: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
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
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
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
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
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
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: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
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
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
Neil Fuller [Fri, 15 Sep 2017 09:51:42 +0000 (09:51 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
am:
293e2f9955 -s ours
Change-Id: Ib284f6bd5932b602de55bf154b644dc43a2774ec
Neil Fuller [Fri, 15 Sep 2017 09:40:05 +0000 (09:40 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
Adam Lesinski [Wed, 13 Sep 2017 21:46:00 +0000 (14:46 -0700)]
AAPT2: Bump to version 2.19
Test: manual
Bug:
65645766
Change-Id: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
Merged-In: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
Yohei Yukawa [Fri, 15 Sep 2017 03:51:23 +0000 (03:51 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
am:
7bbe06231f
Change-Id: Ica5ba4969d1961acd7c037cae285d29c69da1407
TreeHugger Robot [Fri, 15 Sep 2017 03:39:41 +0000 (03:39 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45 am:
4c4fb3bdfb
am:
7fd9aa2654
Change-Id: I6764968b4b3f71be799b0a5e835fdc3624849364
Hall Liu [Fri, 15 Sep 2017 03:22:23 +0000 (03:22 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd am:
3934c475ce
am:
febecb8218
Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
Android Build Merger (Role) [Fri, 15 Sep 2017 02:49:26 +0000 (02:49 +0000)]
Merge "Merge "Fix missing null checking" into oc-mr1-dev am:
93d436f4bc" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 15 Sep 2017 02:48:47 +0000 (02:48 +0000)]
Merge changes from topic "am-
37ab0897d803452791072eae772298af" into oc-mr1-dev-plus-aosp
* changes:
Merge changes Id931d441,I83faf974 am:
89c94f67b4 am:
66d7275d39 am:
dd3f6046b3 -s ours
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours am:
f0a3c209ea -s ours am:
add03c6742 -s ours
Jiyong Park [Fri, 15 Sep 2017 02:47:46 +0000 (02:47 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
am:
93d436f4bc
Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea