OSDN Git Service
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
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
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: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 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 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
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
Narayan Kamath [Fri, 15 Sep 2017 02:46:33 +0000 (02:46 +0000)]
Merge changes Id931d441,I83faf974 am:
89c94f67b4 am:
66d7275d39
am:
dd3f6046b3 -s ours
Change-Id: I28b811c6ef8739f20d88f28023b6f3bafb977a28
Narayan Kamath [Fri, 15 Sep 2017 02:45:30 +0000 (02:45 +0000)]
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours am:
f0a3c209ea -s ours
am:
add03c6742 -s ours
Change-Id: If2a66d01b274ab82b0c8d2b37fc0030a67ad7b6f
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:45 +0000 (02:43 +0000)]
Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
531a955dba" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:03 +0000 (02:43 +0000)]
Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am:
cebe432650" into oc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 15 Sep 2017 02:42:06 +0000 (02:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
531a955dba
Change-Id: Iacfb1e2fc9b06ba9f559e44633a19ad6ab4f9038
sergeyv [Fri, 15 Sep 2017 02:40:32 +0000 (02:40 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
am:
cebe432650
Change-Id: Id5d81c128f6e96bef732508b8a50bad35f3cb298
Jakub Pawlowski [Fri, 15 Sep 2017 02:38:09 +0000 (02:38 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6 am:
3aa179fabd
am:
e22de0f23f
Change-Id: I30dc6840311d338976240cc86b9da9b116b175ad
Andreas Gampe [Fri, 15 Sep 2017 02:34:44 +0000 (02:34 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
am:
2437f9f10c
Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec
Jean-Michel Trivi [Fri, 15 Sep 2017 02:28:28 +0000 (02:28 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
am:
982ee8e6c3
Change-Id: Ifa18821b2ae5b3103f5025df88c0e545bdca56af
Kevin Hufnagle [Fri, 15 Sep 2017 02:24:50 +0000 (02:24 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
677b6f5a7b
Change-Id: Ib225f08dd4d53479adab6df0f3559d09fe09ab21
Lucas Dupin [Fri, 15 Sep 2017 02:20:58 +0000 (02:20 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
am:
06dc14cabc
Change-Id: I838cbedf1388e8fcab56ecf824730b9ac871a738
Jiyong Park [Fri, 15 Sep 2017 02:19:19 +0000 (02:19 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
Matthew Ng [Fri, 15 Sep 2017 02:17:32 +0000 (02:17 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
am:
33b1e1fe4d
Change-Id: Ic7c0ffeb7f295c4161d01d7ad1d0ae2eae6d9f85
TreeHugger Robot [Fri, 15 Sep 2017 02:15:23 +0000 (02:15 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
Matthew Ng [Fri, 15 Sep 2017 02:14:26 +0000 (02:14 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
am:
03f8b068a9
Change-Id: I83d71c531785410cf7aaaf18d921b0a3bcfa77eb
TreeHugger Robot [Fri, 15 Sep 2017 02:11:12 +0000 (02:11 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
Beverly [Fri, 15 Sep 2017 02:10:50 +0000 (02:10 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
am:
8bba760b4f
Change-Id: Ib0982cf352af1e107f182251a1d01382865228d8
Hall Liu [Fri, 15 Sep 2017 01:54:30 +0000 (01:54 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45
am:
4c4fb3bdfb
Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f
Jean-Michel Trivi [Fri, 15 Sep 2017 01:37:55 +0000 (01:37 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 01:35:37 +0000 (01:35 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd
am:
3934c475ce
Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058
Narayan Kamath [Fri, 15 Sep 2017 01:09:04 +0000 (01:09 +0000)]
Merge changes Id931d441,I83faf974 am:
89c94f67b4
am:
66d7275d39
Change-Id: Ic0d6dba2b5560b335b3be8e27a88c01c960ec0aa
Narayan Kamath [Fri, 15 Sep 2017 01:08:10 +0000 (01:08 +0000)]
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours
am:
f0a3c209ea -s ours
Change-Id: Ia7d6e42a813e2277a60eb4def84c106e744aea11
Kevin Hufnagle [Fri, 15 Sep 2017 01:01:15 +0000 (01:01 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
TreeHugger Robot [Fri, 15 Sep 2017 00:56:22 +0000 (00:56 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 00:55:42 +0000 (00:55 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ic808c82a82028169ed7aebd8c6d1b25f9e2b84cf
Hall Liu [Fri, 15 Sep 2017 00:45:05 +0000 (00:45 +0000)]
Merge "API council suggested edits, part 3"
am:
7a4cc05d45
Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Hall Liu [Fri, 15 Sep 2017 00:40:49 +0000 (00:40 +0000)]
Merge "Apply suggested edits to the file-download API"
am:
f6c9baa0cd
Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
Hall Liu [Fri, 15 Sep 2017 00:21:58 +0000 (00:21 +0000)]
Merge "API council suggested edits, part 3"
Hall Liu [Fri, 15 Sep 2017 00:21:13 +0000 (00:21 +0000)]
Merge "Apply suggested edits to the file-download API"
Hall Liu [Sat, 9 Sep 2017 01:02:38 +0000 (18:02 -0700)]
API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug:
30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Hall Liu [Sat, 2 Sep 2017 00:59:15 +0000 (17:59 -0700)]
Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug:
30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
Jakub Pawlowski [Fri, 15 Sep 2017 00:01:54 +0000 (00:01 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6
am:
3aa179fabd
Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
Yohei Yukawa [Thu, 14 Sep 2017 23:35:06 +0000 (16:35 -0700)]
Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS
TYPE_TEXT_FLAG_NO_SUGGESTIONS is just a hint and does not mean
IME should never show a UI to display suggestions.
This CL makes that point clear in JavaDoc.
Test: checkbuild
Bug:
35875399
Bug:
38139781
Bug:
38184682
Fixes:
65693181
Change-Id: Id0c3b6bc05689a5f1c8b52637664f59d45850a60
Narayan Kamath [Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)]
Merge changes Id931d441,I83faf974
am:
89c94f67b4
Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
Narayan Kamath [Thu, 14 Sep 2017 23:55:49 +0000 (23:55 +0000)]
Zygote: Fix race condition on package preloads.
am:
a3d4230b92 -s ours
Change-Id: I6fc6b967f04a6f3cc87908b7fdba72e26a9fb025
Treehugger Robot [Thu, 14 Sep 2017 23:41:34 +0000 (23:41 +0000)]
Merge changes Id931d441,I83faf974
* changes:
Zygote: Improve logging and error handling during connections.
Zygote: Fix race condition on package preloads.
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:00 +0000 (23:36 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
am:
fee4546fd6
Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
TreeHugger Robot [Thu, 14 Sep 2017 23:28:24 +0000 (23:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 23:27:04 +0000 (23:27 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
Jiyong Park [Thu, 14 Sep 2017 22:48:06 +0000 (07:48 +0900)]
Fix missing null checking
Bug:
65666724
Test: build
Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
Treehugger Robot [Thu, 14 Sep 2017 22:59:37 +0000 (22:59 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
* changes:
Fix included service parsing (3/3)
Bluetooth: fix typo in comment