OSDN Git Service
Christopher Tate [Thu, 20 Apr 2017 14:39:30 +0000 (14:39 +0000)]
Merge "Treat the intent filter verifier app as foreground" into oc-dev am:
4b26576175
am:
1777b3f5a6
Change-Id: I8fc06443c25f0360cd140e5b3b01c27f66b32416
Suprabh Shukla [Thu, 20 Apr 2017 14:37:05 +0000 (14:37 +0000)]
Merge "Package installer related changes to javadoc" into oc-dev am:
52312298b6
am:
a2450bacdc
Change-Id: I7bf7b87bfc5f4eb71b8cc1177375c257e5c79499
Todd Kennedy [Thu, 20 Apr 2017 14:29:27 +0000 (14:29 +0000)]
Merge "Adjust the bind timeout" into oc-dev am:
9d9d31d6b0
am:
a01fbf8ebb
Change-Id: Ib1224838aa09c434e1113891e9b4e1fdaa19a0d7
Todd Kennedy [Thu, 20 Apr 2017 14:27:50 +0000 (14:27 +0000)]
Merge "don't blindly reuse content providers" into oc-dev am:
9b32a057c7
am:
21967abbf7
Change-Id: I990d53630facae05a697b1fbffec6f03534b89af
Android Build Merger (Role) [Thu, 20 Apr 2017 14:17:20 +0000 (14:17 +0000)]
Merge "Merge "Opt out default focus highlight for TV." into oc-dev am:
6a08dfab0e am:
31d5f7ee7c"
Jiaquan He [Thu, 20 Apr 2017 14:14:30 +0000 (14:14 +0000)]
Merge "Opt out default focus highlight for TV." into oc-dev am:
6a08dfab0e
am:
31d5f7ee7c
Change-Id: Ia5bef6864d45774262f00dfb10ba9c10d274e470
Android Build Merger (Role) [Thu, 20 Apr 2017 14:14:07 +0000 (14:14 +0000)]
Merge "Merge "Fix tint on accessibility stream" into oc-dev am:
269e549e44 am:
8236e2c889"
Jason Monk [Thu, 20 Apr 2017 14:11:27 +0000 (14:11 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev am:
269e549e44
am:
8236e2c889
Change-Id: I024abdf786dc1347718b25f0fdb4620672b1067b
Android Build Merger (Role) [Thu, 20 Apr 2017 14:10:22 +0000 (14:10 +0000)]
Merge "Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev am:
8305a1fb38 am:
c98b052084"
Dianne Hackborn [Thu, 20 Apr 2017 14:03:35 +0000 (14:03 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev am:
8305a1fb38
am:
c98b052084
Change-Id: If92fbe83687cbc2a316b82ba23bb6eb02d315b2a
Android Build Merger (Role) [Thu, 20 Apr 2017 14:03:12 +0000 (14:03 +0000)]
Merge "Merge "Allow verifier to be optional" into oc-dev am:
8ffd8f7848 am:
72287ab766"
Todd Kennedy [Thu, 20 Apr 2017 14:00:26 +0000 (14:00 +0000)]
Merge "Allow verifier to be optional" into oc-dev am:
8ffd8f7848
am:
72287ab766
Change-Id: I8fa8fa36781444904eb13bea539d283f79462186
Android Build Merger (Role) [Thu, 20 Apr 2017 13:59:50 +0000 (13:59 +0000)]
Merge "Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp am:
88522c5f5d"
Jakub Pawlowski [Thu, 20 Apr 2017 13:56:06 +0000 (13:56 +0000)]
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp
am:
88522c5f5d
Change-Id: I8a07a4e8a6466d5629d504e900c11d5164ba9490
Android Build Merger (Role) [Thu, 20 Apr 2017 13:55:31 +0000 (13:55 +0000)]
Merge "Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev am:
f9f8120e56 am:
34a50ae5f9"
Hyunyoung Song [Thu, 20 Apr 2017 13:52:48 +0000 (13:52 +0000)]
Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev am:
f9f8120e56
am:
34a50ae5f9
Change-Id: Ib219189920f2604c0a463860eb21b82a5e6507a5
Android Build Merger (Role) [Thu, 20 Apr 2017 13:52:19 +0000 (13:52 +0000)]
Merge "Merge "Log when an app targeting O does not specify a channel" into oc-dev am:
af12b17674 am:
e5dbc384fd"
Geoffrey Pitsch [Thu, 20 Apr 2017 13:49:36 +0000 (13:49 +0000)]
Merge "Log when an app targeting O does not specify a channel" into oc-dev am:
af12b17674
am:
e5dbc384fd
Change-Id: I89607e6075c64d4b25c2794b74cc60b4d35e7344
Android Build Merger (Role) [Thu, 20 Apr 2017 13:49:05 +0000 (13:49 +0000)]
Merge "Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev am:
e53b00c6d1 am:
09071f9bdf"
Romain Guy [Thu, 20 Apr 2017 13:46:24 +0000 (13:46 +0000)]
Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev am:
e53b00c6d1
am:
09071f9bdf
Change-Id: I7229520e46f2ee3f0f49f0971b761b2a4a4358c1
Android Build Merger (Role) [Thu, 20 Apr 2017 13:44:12 +0000 (13:44 +0000)]
Merge changes from topic 'am-
3df7247558f2482ba6861f739fe61c7e'
* changes:
Merge changes from topic 'chooser' into oc-dev am:
28602c0921 am:
4d0f44d7a7
Create a valid ActivityOptions Bundle even for default animations am:
b759bd3b4a am:
d85e60aa46
Remove scale up animation for startActivity from RemoteViews am:
95b193fdca am:
594f401e26
Ian Lake [Thu, 20 Apr 2017 13:40:10 +0000 (13:40 +0000)]
Merge changes from topic 'chooser' into oc-dev am:
28602c0921
am:
4d0f44d7a7
Change-Id: Ic8ce0c2e7d397fbd0f3d2aa38f0eff9bbf7f4e8f
Ian Lake [Thu, 20 Apr 2017 13:39:13 +0000 (13:39 +0000)]
Create a valid ActivityOptions Bundle even for default animations am:
b759bd3b4a
am:
d85e60aa46
Change-Id: I4c863de66246d6d9a6c64ea1e428094a15c682c1
Ian Lake [Thu, 20 Apr 2017 13:37:42 +0000 (13:37 +0000)]
Remove scale up animation for startActivity from RemoteViews am:
95b193fdca
am:
594f401e26
Change-Id: Ifd958d94b0032d486e01e1be8d44d1b68ca1c4b7
Android Build Merger (Role) [Thu, 20 Apr 2017 13:37:05 +0000 (13:37 +0000)]
Merge "Merge "Change ANDROID_ID for Instant Apps" into oc-dev am:
904e6cad28 am:
97eecf8d09"
Chad Brubaker [Thu, 20 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "Change ANDROID_ID for Instant Apps" into oc-dev am:
904e6cad28
am:
97eecf8d09
Change-Id: Ibbea27ef27bfaa43649d0ff86e23f0ffd559d7f6
Android Build Merger (Role) [Thu, 20 Apr 2017 13:33:49 +0000 (13:33 +0000)]
Merge "Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev am:
7844a34308 am:
90a29fe305"
Adam Lesinski [Thu, 20 Apr 2017 13:31:08 +0000 (13:31 +0000)]
Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev am:
7844a34308
am:
90a29fe305
Change-Id: Id86baf67c37eba17974f8f15447984e576b75428
Android Build Merger (Role) [Thu, 20 Apr 2017 13:30:45 +0000 (13:30 +0000)]
Merge "Merge "QS BluetoothTile proiritizes connected device" into oc-dev am:
d5dfde890c am:
7b19567564"
tturney [Thu, 20 Apr 2017 13:28:06 +0000 (13:28 +0000)]
Merge "QS BluetoothTile proiritizes connected device" into oc-dev am:
d5dfde890c
am:
7b19567564
Change-Id: I48eda471e06626381d0e89b7aaa49e10b6774189
Android Build Merger (Role) [Thu, 20 Apr 2017 13:27:44 +0000 (13:27 +0000)]
Merge "Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am:
992541027b am:
58b0a7d3e9"
Eugene Susla [Thu, 20 Apr 2017 13:24:59 +0000 (13:24 +0000)]
Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am:
992541027b
am:
58b0a7d3e9
Change-Id: Ief8d667257fec6c14f9626b69431545cb47b5575
Android Build Merger (Role) [Thu, 20 Apr 2017 13:24:37 +0000 (13:24 +0000)]
Merge "Merge "Fix compose shader child local matrix mutation" into oc-dev am:
611fae13df am:
88677af970"
Chris Craik [Thu, 20 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "Fix compose shader child local matrix mutation" into oc-dev am:
611fae13df
am:
88677af970
Change-Id: I68729ff5415f329feeabb160c0308ecbe3d8fb3f
Android Build Merger (Role) [Thu, 20 Apr 2017 13:21:15 +0000 (13:21 +0000)]
Merge "Merge "Don't show starting window for overlay activities" into oc-dev am:
57d0c0bb43 am:
6a9ffcacf5"
Wale Ogunwale [Thu, 20 Apr 2017 13:18:40 +0000 (13:18 +0000)]
Merge "Don't show starting window for overlay activities" into oc-dev am:
57d0c0bb43
am:
6a9ffcacf5
Change-Id: I9de9a397d5ba9122a79632b13d0c2d45c141c00d
Android Build Merger (Role) [Thu, 20 Apr 2017 13:18:12 +0000 (13:18 +0000)]
Merge "Merge "Flesh out more API docs." into oc-dev am:
3a427c3bd9 am:
750d6d12f6"
TreeHugger Robot [Thu, 20 Apr 2017 13:17:02 +0000 (13:17 +0000)]
Merge "Do not check user escrow state if synthetic password is not enabled yet"
Jeff Sharkey [Thu, 20 Apr 2017 13:15:28 +0000 (13:15 +0000)]
Merge "Flesh out more API docs." into oc-dev am:
3a427c3bd9
am:
750d6d12f6
Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
Jerry Zhang [Thu, 20 Apr 2017 13:11:48 +0000 (13:11 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev am:
a73f9f874a
am:
bf51f836ae
Change-Id: Ie358c38f98d186ed0197248fcf82db2913cfe97d
Salvador Martinez [Thu, 20 Apr 2017 13:07:32 +0000 (13:07 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev am:
95cdc61248
am:
cc1e8bce91
Change-Id: I46709c2743dfdb93c838dd86ab658eff35d451e4
Philipp Weiß [Thu, 20 Apr 2017 13:05:28 +0000 (13:05 +0000)]
Merge "Redesign QSSecurityFooter dialog"
TreeHugger Robot [Thu, 20 Apr 2017 13:02:17 +0000 (13:02 +0000)]
Merge "String fixes in QSFooter"
Jeff Hao [Thu, 20 Apr 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev am:
e2c6cbbd72
am:
cb3d808e18
Change-Id: Id91e4f53f15b7c3899af6680880f86cb97a856ab
Eugene Susla [Thu, 20 Apr 2017 12:50:25 +0000 (12:50 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev am:
4d95e40bb3
am:
aaa64afd83
Change-Id: Idbae279855b0851cf53fc1a7e17594a0590acbf3
Jeff Sharkey [Thu, 20 Apr 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Some folks like sending null fields." into oc-dev am:
9a1967e157
am:
218c2135b6
Change-Id: I56fe999c3edb167aac57284700d3ccbbc5d4f9ea
Seigo Nonaka [Thu, 20 Apr 2017 12:42:11 +0000 (12:42 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev am:
f3157e1692
am:
39b5ad8411
Change-Id: Ia159ba2bff5cc333e6945d05291002ab8669c612
Matt Sarett [Thu, 20 Apr 2017 12:37:24 +0000 (12:37 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev am:
dc3ab163d3
am:
515222acd2
Change-Id: I214885c57e77ffd8a991478c96fb70582ce43e6c
TreeHugger Robot [Thu, 20 Apr 2017 12:05:46 +0000 (12:05 +0000)]
Merge "Add more explicit documentation for install reason"
Rubin Xu [Wed, 12 Apr 2017 17:02:44 +0000 (18:02 +0100)]
Do not check user escrow state if synthetic password is not enabled yet
1. when adding escrow tokens, do not throw SecurityException if the user hasn't
migrated to synthetic password yet.
2. during migration, activate any pending escrow tokens.
3. Disable escrow before attempting to activate escrow tokens, this currently
includes whenever the user authenticates, and when synthetic password
migration happens.
Also, add some comments in SyntheticPasswordManager and remove an invalid call
to destroy escrow data.
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Bug:
36776133
Change-Id: If4b9d385fb43e09d90b6dde6d25b4fcc0c6b7ddc
phweiss [Wed, 19 Apr 2017 18:14:51 +0000 (20:14 +0200)]
Redesign QSSecurityFooter dialog
The dialog consists now of up to four sections: Device management,
CA certificates, Network Logging and VPN.
Also, small tweaks to the footer's coloring after the theme change of QS.
Bug:
34369166
Bug:
37492743
Test: in class QSSecurityFooterTest, which is part of "runtest systemui"
Change-Id: Ibf07a26fb6c5485a152f9d447f10c0f73acb94ba
TreeHugger Robot [Thu, 20 Apr 2017 07:48:42 +0000 (07:48 +0000)]
Merge "Handle runtime exception in clip data"
Daichi Hirono [Wed, 12 Apr 2017 05:23:06 +0000 (14:23 +0900)]
Handle runtime exception in clip data
When invoking ContentProvider through binder, ContentProvider may return
any type of RuntimeException. To let ClipData fall back to URI when it
failes to obtain text explanation, the CL add a catch closure for
RuntimeException.
Bug:
37260995
Test: Manually
Change-Id: I54ffbbcb05be3f3ff1ebc1c3dc68c074e6eb9825
TreeHugger Robot [Thu, 20 Apr 2017 04:22:09 +0000 (04:22 +0000)]
Merge "Apply Android code style to RefactoredBackupManagerService."
TreeHugger Robot [Thu, 20 Apr 2017 03:57:41 +0000 (03:57 +0000)]
Merge "Update layoutlib following Changes I7cf390d9 and I65e220ac"
Colin Cross [Thu, 20 Apr 2017 03:16:16 +0000 (03:16 +0000)]
Merge "Convert libinputservice to Android.bp"
Colin Cross [Thu, 20 Apr 2017 00:00:07 +0000 (17:00 -0700)]
Convert libinputservice to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
Evan Rosky [Thu, 20 Apr 2017 00:35:11 +0000 (00:35 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev am:
4ab21012a7
am:
a5f350fbb6
Change-Id: I70dde5b45f07d4af510e37073e22a9f3679715cc
Fan Zhang [Thu, 20 Apr 2017 00:33:26 +0000 (00:33 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev am:
3a8d8db6ad
am:
a796215cb6
Change-Id: Icb843731ba6f7a9da19dd441366762927b9a7e22
Jason Monk [Thu, 20 Apr 2017 00:31:12 +0000 (00:31 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev am:
214a8bdaee
am:
2253109ff8
Change-Id: I776d42072d206635ba6f5a609ab3662edce1954d
Abodunrinwa Toki [Thu, 20 Apr 2017 00:29:23 +0000 (00:29 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev am:
ef0512a87a
am:
a98659942a
Change-Id: Id71eabec30d32c70301aa8f454a35ed97fe39a57
George Mount [Thu, 20 Apr 2017 00:25:56 +0000 (00:25 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev am:
681ff5c7d8
am:
300a24c282
Change-Id: I29988d21eaaf1b1e49d8f90be921b77b5f3a368d
Wei Wang [Thu, 20 Apr 2017 00:23:42 +0000 (00:23 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev am:
b1f7358d98
am:
dca07572d9
Change-Id: I81e91999c4a289caceea2407f62ef417c4b71072
Mady Mellor [Thu, 20 Apr 2017 00:21:54 +0000 (00:21 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev am:
043ae355e9
am:
86df7a6574
Change-Id: I4047847af9801e4d8dd9db45be54772abc0fc8d7
Mady Mellor [Thu, 20 Apr 2017 00:19:58 +0000 (00:19 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev am:
c1d9cdfe79
am:
c69c1aafe2
Change-Id: Ie99c3f3aa3f7faf7d2ced99adca13c2788852b51
Zheng Zhang [Thu, 20 Apr 2017 00:16:18 +0000 (00:16 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
9996f8589d -s ours
am:
89a7e998f1 -s ours
Change-Id: I4784b330048232799eb839cff00ca6e04dab5ecc
George Mount [Thu, 20 Apr 2017 00:10:42 +0000 (00:10 +0000)]
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am:
f3ff7b8207" into oc-dev-plus-aosp
am:
5c08716a58
Change-Id: I6ece7583fe6305f08eac7605d171b3d3779f3883
Winson Chung [Thu, 20 Apr 2017 00:08:29 +0000 (00:08 +0000)]
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am:
d1a1c8004e" into oc-dev-plus-aosp
am:
90ee48b66c
Change-Id: I0cac56ba0ce274e031826e2b3f4a2de72935f384
Evan Rosky [Thu, 20 Apr 2017 00:02:00 +0000 (00:02 +0000)]
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am:
f4c31bf67b" into oc-dev-plus-aosp
am:
a5abe8f1d1
Change-Id: Ic5dc4d9ddb8626196ea16638e431869f3fbb5536
Christopher Tate [Wed, 19 Apr 2017 23:59:52 +0000 (23:59 +0000)]
Merge "Treat the intent filter verifier app as foreground" into oc-dev
am:
4b26576175
Change-Id: Ida03ba39150d618d29f005644c2c8eaa30ae1c60
Jason Monk [Wed, 19 Apr 2017 23:51:51 +0000 (23:51 +0000)]
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am:
e262cc234b" into oc-dev-plus-aosp
am:
20a75de6a3
Change-Id: Ic130fd934bead375a55f0a760d21139efb8f6505
TreeHugger Robot [Wed, 19 Apr 2017 23:49:37 +0000 (23:49 +0000)]
Merge "Treat the intent filter verifier app as foreground" into oc-dev
Suprabh Shukla [Wed, 19 Apr 2017 23:44:19 +0000 (23:44 +0000)]
Merge "Package installer related changes to javadoc" into oc-dev
am:
52312298b6
Change-Id: I3c6b175caef36517ed739622831d080b48aae9ac
Yohei Yukawa [Wed, 19 Apr 2017 23:44:15 +0000 (23:44 +0000)]
Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am:
4132f86041" into oc-dev-plus-aosp
am:
2931c05a00
Change-Id: I2b621496be3d688ba547188ef4bd68f35fe5d1a8
Makoto Onuki [Wed, 19 Apr 2017 23:40:32 +0000 (23:40 +0000)]
Merge "Merge "Add missing services to incident_report" into oc-dev am:
f431ea56e1" into oc-dev-plus-aosp
am:
eef394369f
Change-Id: Iada6dbb1056d54fd5b68ba716532f10e0cebc462
Adam Lesinski [Wed, 19 Apr 2017 23:34:56 +0000 (23:34 +0000)]
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am:
83c9413b75" into oc-dev-plus-aosp
am:
a79d516e63
Change-Id: Ib158c3a45ec89b7374418c064d7b46cc4ab8f551
TreeHugger Robot [Wed, 19 Apr 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Package installer related changes to javadoc" into oc-dev
Adam Lesinski [Wed, 19 Apr 2017 23:27:58 +0000 (23:27 +0000)]
Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am:
26e1d91939" into oc-dev-plus-aosp
am:
16e009466d
Change-Id: I215de04fec240441d20e22702b228d35b67811ea
Todd Kennedy [Wed, 19 Apr 2017 23:23:26 +0000 (23:23 +0000)]
Merge "Adjust the bind timeout" into oc-dev
am:
9d9d31d6b0
Change-Id: I53b0afac3e8e8247a3bc2154a32f775dc707ef5c
Todd Kennedy [Wed, 19 Apr 2017 23:21:06 +0000 (23:21 +0000)]
Merge "don't blindly reuse content providers" into oc-dev
am:
9b32a057c7
Change-Id: I3d4fc2c9d877a0065e67ca9ec7d5f3cfedec9046
Jiaquan He [Wed, 19 Apr 2017 23:13:56 +0000 (23:13 +0000)]
Merge "Opt out default focus highlight for TV." into oc-dev
am:
6a08dfab0e
Change-Id: I94e6a4fc0d7ab06fc5fd477c0d0160e061e8b3ae
Zheng Zhang [Wed, 19 Apr 2017 23:13:41 +0000 (23:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
86c579678e -s ours" into oc-dev-plus-aosp
am:
3aee91cd80 -s ours
Change-Id: I534ea317ca49024558d24c7397658696fe57a0c3
Lucas Dupin [Wed, 19 Apr 2017 23:08:28 +0000 (23:08 +0000)]
Merge "Internal copy of Palette API." into oc-dev am:
8b4cca11f3
am:
5086a1d005
Change-Id: I4d297f8ec8c68f6c1b8994a2cc7f59b360476419
TreeHugger Robot [Wed, 19 Apr 2017 23:07:34 +0000 (23:07 +0000)]
Merge "Adjust the bind timeout" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 23:07:07 +0000 (23:07 +0000)]
Merge "don't blindly reuse content providers" into oc-dev
Jason Monk [Wed, 19 Apr 2017 23:04:52 +0000 (23:04 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev
am:
269e549e44
Change-Id: I3e7a70ab352cf0b400dbf509b11636550c941642
Sunny Goyal [Wed, 19 Apr 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am:
7790695bf2
am:
fa7cc65529
Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
TreeHugger Robot [Wed, 19 Apr 2017 22:57:46 +0000 (22:57 +0000)]
Merge "Opt out default focus highlight for TV." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Merge commit '
695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c"
TreeHugger Robot [Wed, 19 Apr 2017 22:56:21 +0000 (22:56 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Add implementation alternatives for OemLockManager."
Rubin Xu [Wed, 19 Apr 2017 22:32:51 +0000 (22:32 +0000)]
Merge "Integrate weaver into authentication flow"
Rubin Xu [Fri, 31 Mar 2017 17:03:20 +0000 (18:03 +0100)]
Integrate weaver into authentication flow
Use the weaver applet running inside secure element to enforce
password verification back-off and provide secure deletion.
Bug:
30328567
Test: runtest frameworks-services -c com.android.server.WeaverBasedSyntheticPasswordTests
Test: manually on marlin/secure element with applet/secure element without applet
Change-Id: I376dd9707c90d005e56c85ee79a26fdc428779bf
Dianne Hackborn [Wed, 19 Apr 2017 22:29:59 +0000 (22:29 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
am:
8305a1fb38
Change-Id: I57e7e983ff3492fe3a6cf3560eded4122a7bd736
Dianne Hackborn [Wed, 19 Apr 2017 22:20:52 +0000 (22:20 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 22:18:52 +0000 (22:18 +0000)]
Merge "Opt out default focus highlight for TV."
Todd Kennedy [Wed, 19 Apr 2017 22:04:33 +0000 (22:04 +0000)]
Merge "Allow verifier to be optional" into oc-dev
am:
8ffd8f7848
Change-Id: Ide9c5e7eb6a88b5962cb63f10272a81184b4e4c7
Android Build Merger (Role) [Wed, 19 Apr 2017 21:52:07 +0000 (21:52 +0000)]
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 19 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Pre-merge hide API for a11y service state"
TreeHugger Robot [Wed, 19 Apr 2017 21:51:21 +0000 (21:51 +0000)]
Merge "Allow verifier to be optional" into oc-dev
OSDN Git Service
