OSDN Git Service
Alan Viverette [Wed, 7 Dec 2016 17:02:54 +0000 (17:02 +0000)]
Add missing API diffs for support library 25.0.0
am:
94280c0a91
Change-Id: Ia5b4506fa104b161b2f65dd7820f2dec65e65232
Alan Viverette [Fri, 11 Nov 2016 22:11:01 +0000 (17:11 -0500)]
Add missing API diffs for support library 25.0.0
Bug:
33408968
Test: n/a
Change-Id: I497b2a24248c1511c0d6eca4d5951451e4870b83
Paul Duffin [Wed, 7 Dec 2016 13:16:12 +0000 (13:16 +0000)]
Merge "Replace core-junit with junit" am:
6ac5293751 am:
a4d7100a3b
am:
9cb5f2815d
Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b
Paul Duffin [Wed, 7 Dec 2016 13:08:36 +0000 (13:08 +0000)]
Merge "Replace core-junit with junit" am:
6ac5293751
am:
a4d7100a3b
Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55
Paul Duffin [Wed, 7 Dec 2016 13:00:32 +0000 (13:00 +0000)]
Merge "Replace core-junit with junit"
am:
6ac5293751
Change-Id: I855552fe62801b2534ef63c2c62919bbd845a9af
Paul Duffin [Wed, 7 Dec 2016 12:52:01 +0000 (12:52 +0000)]
Merge "Replace core-junit with junit"
Erik Kline [Wed, 7 Dec 2016 09:38:06 +0000 (09:38 +0000)]
Merge "Handle IpReachabilityMonitor errors better." am:
3af34c8e0a am:
4467b79592
am:
7549504970
Change-Id: Icf0ac5ea30fb0a72038979793ea8c673963a7764
Erik Kline [Wed, 7 Dec 2016 09:30:09 +0000 (09:30 +0000)]
Merge "Handle IpReachabilityMonitor errors better." am:
3af34c8e0a
am:
4467b79592
Change-Id: I5d4d2d9888d85a684425b8204785099f818e6546
Erik Kline [Wed, 7 Dec 2016 09:26:05 +0000 (09:26 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
am:
3af34c8e0a
Change-Id: Ie13ed70165359e8f312a3744cc26a8d1b6f4730c
Treehugger Robot [Wed, 7 Dec 2016 09:17:21 +0000 (09:17 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
Erik Kline [Fri, 14 Oct 2016 09:33:22 +0000 (18:33 +0900)]
Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().
Test: runtest frameworks-wifi
passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
which fails with an NPE for unrelated reasons.
Bug:
31038971
Bug:
31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
(cherry picked from commit
e4526604664cb66ecdcbeca4d8f64e8c94750c31)
Jeff Sharkey [Wed, 7 Dec 2016 06:58:25 +0000 (06:58 +0000)]
Merge "Move more installd methods to Binder." am:
3101778fb2 am:
f058c4048a
am:
2c01c43055
Change-Id: Iba90979d45d700e753a875e1a3b436ca6572fd5d
Jeff Sharkey [Wed, 7 Dec 2016 06:53:34 +0000 (06:53 +0000)]
Merge "Move more installd methods to Binder." am:
3101778fb2
am:
f058c4048a
Change-Id: I50ea69a6f264df7a674b8fb2fc19c02bdf5ca9db
Jeff Sharkey [Wed, 7 Dec 2016 06:46:15 +0000 (06:46 +0000)]
Merge "Move more installd methods to Binder."
am:
3101778fb2
Change-Id: I35d40a7a2a368cc36a2d265db87328f3f489fec9
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Felipe Leme [Wed, 7 Dec 2016 02:31:47 +0000 (02:31 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev
am:
d95fc2d4c9
Change-Id: I1897900ed10da2adcb49f144b549044f46e530ba
Felipe Leme [Wed, 7 Dec 2016 02:31:41 +0000 (02:31 +0000)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
am:
965f4265c5
Change-Id: Ib7380a343f55e262c2df61d7ad9fc9e8e959a7b7
Andreas Gampe [Wed, 7 Dec 2016 02:27:41 +0000 (02:27 +0000)]
Merge "Workaround for javac compilation issue of lambda code" am:
90e5fc0970 am:
1c1782cb06
am:
9d267851b8
Change-Id: Ib7783ecd435367b8e2d0a75b1f982818cde681f5
TreeHugger Robot [Wed, 7 Dec 2016 02:24:34 +0000 (02:24 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev
Andreas Gampe [Wed, 7 Dec 2016 02:19:52 +0000 (02:19 +0000)]
Merge "Workaround for javac compilation issue of lambda code" am:
90e5fc0970
am:
1c1782cb06
Change-Id: Ic766abed3d5b2cd2cce4f011667c0df8cc7b0ea0
Andreas Gampe [Wed, 7 Dec 2016 02:12:39 +0000 (02:12 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
am:
90e5fc0970
Change-Id: Ie7f376587c793ef9312626e41ee4be40f66de5f4
Andreas Gampe [Wed, 7 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
Tomasz Mikolajewski [Wed, 7 Dec 2016 02:01:12 +0000 (02:01 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing." am:
68ea36243d am:
15cd392108
am:
3199d58939
Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596
Tomasz Mikolajewski [Wed, 7 Dec 2016 01:54:13 +0000 (01:54 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing." am:
68ea36243d
am:
15cd392108
Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47
Jeff Sharkey [Tue, 6 Dec 2016 06:39:46 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
Tomasz Mikolajewski [Wed, 7 Dec 2016 01:50:08 +0000 (01:50 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
am:
68ea36243d
Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec
Mark Renouf [Tue, 1 Nov 2016 15:48:24 +0000 (11:48 -0400)]
Workaround for javac compilation issue of lambda code
Since ag/
32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:
> ShortcutService.java:408: error: variable ri might not have been initialized
https://android-build.googleplex.com/builds/submitted/
3416256/angelfish-userdebug/latest/logs
Removing the lambda expressions corrects the issue.
(cherry picked from commit
e065f7c5a9ad4e47f5490793401445660af37624)
BUG:
32554459
Test: m
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
Jeremy Joslin [Wed, 7 Dec 2016 01:42:22 +0000 (01:42 +0000)]
Merge "Adding a new string array resource for network recommendations." am:
54710df28d am:
ea968e411c -s ours
am:
472d5ecb5f -s ours
Change-Id: Ifa31e990cf70eb861588f1cf1f4539fe0cc78319
Treehugger Robot [Wed, 7 Dec 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
Jeremy Joslin [Wed, 7 Dec 2016 01:34:46 +0000 (01:34 +0000)]
Merge "Adding a new string array resource for network recommendations." am:
54710df28d
am:
ea968e411c -s ours
Change-Id: I32b30b622e71c782deb21c627b33f23422c3d3ad
Jeremy Joslin [Wed, 7 Dec 2016 01:27:10 +0000 (01:27 +0000)]
Merge "Adding a new string array resource for network recommendations."
am:
54710df28d
Change-Id: I7d86f734b88ff4f008e5b2e250f97f8836780ab1
Treehugger Robot [Wed, 7 Dec 2016 01:17:16 +0000 (01:17 +0000)]
Merge "Adding a new string array resource for network recommendations."
Jeremy Joslin [Thu, 1 Dec 2016 00:44:11 +0000 (16:44 -0800)]
Adding a new string array resource for network recommendations.
The new resource allows for multiple package names to be specified
in priority order.
Test: Nothing to test.
BUG:
33158362
Merged-In: I4a066d9220c723a17dd11e2566161fade6bb471b
Merged-In: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
Change-Id: I26ac87a49ae94dd0763173af5c8a2c6abe7cb5f8
Bill Yi [Wed, 7 Dec 2016 00:13:21 +0000 (00:13 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
82834baa35 am:
eaa66c3082 -s ours
am:
f5795bcf54 -s ours
Change-Id: I1e0e1fc911d6afa7dbca3ec89a024944790194d8
Jeremy Joslin [Wed, 7 Dec 2016 00:12:27 +0000 (00:12 +0000)]
Merge "API for requesting network recommendations." am:
800a4e753e am:
2b57c69e25
am:
33e8de479a
Change-Id: Ibf7f6a12eeb92f56c5873c3f7e3e10ff4adbd8fd
Jeff Sharkey [Wed, 7 Dec 2016 00:11:40 +0000 (00:11 +0000)]
Merge "Move moveCompleteApp() to Binder." am:
019867cb52 am:
19426fef23
am:
d917e23bbb
Change-Id: I56d8e35174cce6a892f73f32b8246a377ba645ab
Felipe Leme [Mon, 5 Dec 2016 18:51:30 +0000 (10:51 -0800)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
Change-Id: I84dc652f7297c2b8c9351e737074ddf43754718d
Fixes:
32950329
Test: manually verified it
Bill Yi [Wed, 7 Dec 2016 00:06:43 +0000 (00:06 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
82834baa35
am:
eaa66c3082 -s ours
Change-Id: I009f3327782fdb3506d30cbf75f59bbed31ed2e1
Jeremy Joslin [Wed, 7 Dec 2016 00:05:29 +0000 (00:05 +0000)]
Merge "API for requesting network recommendations." am:
800a4e753e
am:
2b57c69e25
Change-Id: I8f2357942919193a22e97e4f1d9ec415b736565c
Jeff Sharkey [Wed, 7 Dec 2016 00:04:35 +0000 (00:04 +0000)]
Merge "Move moveCompleteApp() to Binder." am:
019867cb52
am:
19426fef23
Change-Id: I15640b868729b0f8e418c7b9f8d5366deb054abc
Bill Yi [Tue, 6 Dec 2016 23:59:13 +0000 (23:59 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
82834baa35
Change-Id: I888a0d89112441f4b7bbd7fed582646dc053bccd
Jeremy Joslin [Tue, 6 Dec 2016 23:58:13 +0000 (23:58 +0000)]
Merge "API for requesting network recommendations."
am:
800a4e753e
Change-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9
Jeff Sharkey [Tue, 6 Dec 2016 23:57:05 +0000 (23:57 +0000)]
Merge "Move moveCompleteApp() to Binder."
am:
019867cb52
Change-Id: I93e3d468b2a49f735c88e7a5146f0b013c6d49eb
Bill Yi [Tue, 6 Dec 2016 23:17:16 +0000 (15:17 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Treehugger Robot [Tue, 6 Dec 2016 23:08:02 +0000 (23:08 +0000)]
Merge "API for requesting network recommendations."
Jordan Liu [Tue, 6 Dec 2016 22:28:39 +0000 (22:28 +0000)]
Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev
am:
7ba6d21aac
Change-Id: I8db690ca67ce95fe63afaf160a834885ba3d55ff
Jordan Liu [Tue, 6 Dec 2016 22:28:30 +0000 (22:28 +0000)]
Treat the mdn as an additional voicemail number
am:
360d5674bd
Change-Id: Idbfdf0086d101e6c246ecee7572c6dbf2702574e
Jeff Sharkey [Tue, 6 Dec 2016 22:24:25 +0000 (22:24 +0000)]
Merge "Move moveCompleteApp() to Binder."
Jordan Liu [Tue, 6 Dec 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev
Jeremy Joslin [Tue, 6 Dec 2016 21:03:22 +0000 (21:03 +0000)]
Merge "Adding a new string array resource for network recommendations." into nyc-mr1-dev-plus-aosp
am:
95b7e5fb21
Change-Id: I5550363bba2c615eacb507fb8c931520b0342b5d
Jeremy Joslin [Tue, 6 Dec 2016 21:03:18 +0000 (21:03 +0000)]
Adding a new string array resource for network recommendations.
am:
b63bf2a5ef
Change-Id: Icadfc2ee9fa108c9bdf62f167f13497da3db814e
Jeff Sharkey [Tue, 6 Dec 2016 20:57:26 +0000 (20:57 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." am:
5773d9702e -s ours am:
5b9b0db9f8 -s ours
am:
6bc035949f -s ours
Change-Id: Ib90b83fee65c2ae095ff26ea5072d422494e6a15
TreeHugger Robot [Tue, 6 Dec 2016 20:55:10 +0000 (20:55 +0000)]
Merge "Adding a new string array resource for network recommendations." into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Tue, 6 Dec 2016 20:49:23 +0000 (20:49 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." am:
5773d9702e -s ours
am:
5b9b0db9f8 -s ours
Change-Id: I085716f45435debc6418dd6bca9369cc2a17e1a4
Jeremy Joslin [Tue, 29 Nov 2016 01:47:35 +0000 (17:47 -0800)]
API for requesting network recommendations.
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.
Test: Coming in a future CL.
BUG:
32909424
Merged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31
Change-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3
Jeff Sharkey [Tue, 6 Dec 2016 20:45:22 +0000 (20:45 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
am:
5773d9702e -s ours
Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b
Pankaj Kanwar [Tue, 6 Dec 2016 20:41:56 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev
am:
df4e14d400
Change-Id: I23e16392c59cd1e306ba334a6aaf1114f165c967
pkanwar [Tue, 6 Dec 2016 20:41:50 +0000 (20:41 +0000)]
DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified.
am:
34be302f2a
Change-Id: I18f1ed3a4e8b6a923e5733fe38566d4484d1c310
Pankaj Kanwar [Tue, 6 Dec 2016 20:35:50 +0000 (20:35 +0000)]
Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev
Android Build Merger (Role) [Tue, 6 Dec 2016 20:22:23 +0000 (20:22 +0000)]
Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am:
647166e852 am:
e9d31e0b46" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 6 Dec 2016 20:22:17 +0000 (20:22 +0000)]
Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am:
647166e852 am:
a49aa940be" into nyc-mr2-dev-plus-aosp
Yuanlang Song [Tue, 6 Dec 2016 20:21:47 +0000 (20:21 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am:
647166e852
am:
e9d31e0b46
Change-Id: I7606364318202ad60b416438f500aaaff8eec0fb
Yuanlang Song [Tue, 6 Dec 2016 20:21:31 +0000 (20:21 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am:
647166e852
am:
a49aa940be
Change-Id: Ibf4d13e4fb4538ed9cfbae489a47057f3e78d644
Android Build Merger (Role) [Tue, 6 Dec 2016 20:21:27 +0000 (20:21 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test am:
91e2e7f460 am:
8360e7e38a" into nyc-mr2-dev-plus-aosp
John Reck [Tue, 6 Dec 2016 20:20:48 +0000 (20:20 +0000)]
DO NOT MERGE: Add TouchLatency test am:
91e2e7f460
am:
8360e7e38a
Change-Id: I9f65c574fd434cce928381f64894642a92014712
John Reck [Tue, 6 Dec 2016 20:20:46 +0000 (20:20 +0000)]
DO NOT MERGE: Add TouchLatency test am:
91e2e7f460
am:
579e3667e3
Change-Id: Ie27b93371a22360e6cdb9dffc2e78c14fa28333f
Treehugger Robot [Tue, 6 Dec 2016 20:15:27 +0000 (20:15 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
Yuanlang Song [Tue, 6 Dec 2016 20:13:54 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
am:
647166e852
Change-Id: I33e59ffbe071470608141579d1742a414f308f76
John Reck [Tue, 6 Dec 2016 20:13:49 +0000 (20:13 +0000)]
DO NOT MERGE: Add TouchLatency test
am:
91e2e7f460
Change-Id: I1eeed0e4aea8dbe2d963b38cfe9d79449e1a17d2
Yuanlang Song [Tue, 6 Dec 2016 20:13:48 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
am:
647166e852
Change-Id: I8985e69d3e04f0da6b923cf15db418338ac4edab
John Reck [Tue, 6 Dec 2016 20:13:45 +0000 (20:13 +0000)]
DO NOT MERGE: Add TouchLatency test
am:
91e2e7f460
Change-Id: I84a284f0316f68c24352178685eaa07f2b259411
Yuanlang Song [Tue, 6 Dec 2016 20:05:43 +0000 (20:05 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
Stephen Chen [Tue, 6 Dec 2016 19:34:46 +0000 (19:34 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am:
70ae1bf4db am:
45fdf32038
am:
e70ef235fb
Change-Id: I46186245e038597018f66e44459d724456e8f993
Stephen Chen [Tue, 6 Dec 2016 19:27:45 +0000 (19:27 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am:
70ae1bf4db
am:
45fdf32038
Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e
Stephen Chen [Tue, 6 Dec 2016 19:20:24 +0000 (19:20 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am:
70ae1bf4db
Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
Treehugger Robot [Tue, 6 Dec 2016 19:11:28 +0000 (19:11 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
Jeff Sharkey [Wed, 9 Nov 2016 19:25:44 +0000 (12:25 -0700)]
Move dump() to dumpAsync(), more oneway calls.
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.
Test: builds, boots, runs with minimal logs triggered
Bug:
32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Merged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5
pkanwar [Tue, 6 Dec 2016 18:09:37 +0000 (10:09 -0800)]
DO NOT MERGE: Add notification delay for when the user needs cannot register to a
network and needs to be notified.
BUG:
28572539
Change-Id: Iabf5e4476a1c5b02d1de38695f7125ee888dadd9
Android Build Merger (Role) [Tue, 6 Dec 2016 18:42:25 +0000 (18:42 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am:
ad7c7acad6 am:
43b08e2fb3" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 6 Dec 2016 18:42:13 +0000 (18:42 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am:
ad7c7acad6 am:
4ce3dee6e6" into nyc-mr2-dev-plus-aosp
Damien Bargiacchi [Tue, 6 Dec 2016 18:41:47 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am:
ad7c7acad6
am:
43b08e2fb3
Change-Id: I62153920f518f43da399d30cc326f968035d9f34
Damien Bargiacchi [Tue, 6 Dec 2016 18:41:38 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am:
ad7c7acad6
am:
4ce3dee6e6
Change-Id: Id92ec78e061736e4b269226cecc8b73e5b19be39
Android Build Merger (Role) [Tue, 6 Dec 2016 18:41:25 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character am:
45a7644004 am:
76a3de316c" into nyc-mr2-dev-plus-aosp
Damien Bargiacchi [Tue, 6 Dec 2016 18:40:41 +0000 (18:40 +0000)]
Centre clock text on visible characters instead of : character am:
45a7644004
am:
76a3de316c
Change-Id: I53dd7121aea7dedf6d96fb6104c37e67784a263a
Damien Bargiacchi [Tue, 6 Dec 2016 18:40:39 +0000 (18:40 +0000)]
Centre clock text on visible characters instead of : character am:
45a7644004
am:
04f17be3e6
Change-Id: Ia6af0064f606062a646aa3e251b56631992aa86b
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:55 +0000 (18:32 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
am:
ad7c7acad6
Change-Id: Id9f91317d128f97ff849f8644f452a9bf7dd9fd2
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:48 +0000 (18:32 +0000)]
Centre clock text on visible characters instead of : character
am:
45a7644004
Change-Id: Ibb152f2217297ab0b0aa1ec622e59ae8ae815d59
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:45 +0000 (18:32 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
am:
ad7c7acad6
Change-Id: Ibc7e4c27b65f87c3b9396b7ae668ed9f55af6f79
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:42 +0000 (18:32 +0000)]
Centre clock text on visible characters instead of : character
am:
45a7644004
Change-Id: I8cf50fd314442a1e42a4cdd4c3f058d680c531dd
TreeHugger Robot [Tue, 6 Dec 2016 18:25:27 +0000 (18:25 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
Jeremy Joslin [Thu, 1 Dec 2016 00:44:11 +0000 (16:44 -0800)]
Adding a new string array resource for network recommendations.
The new resource allows for multiple package names to be specified
in priority order.
Test: Nothing to test.
BUG:
33158362
Change-Id: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
Jason Monk [Tue, 6 Dec 2016 16:49:54 +0000 (16:49 +0000)]
resolve merge conflicts of
9600df0 to stage-aosp-master am:
f120cf3d88
am:
99db203f29
Change-Id: I908b554d4ec2adcec6c6d95c768153bcab569cbf
Jason Monk [Tue, 6 Dec 2016 16:43:38 +0000 (16:43 +0000)]
resolve merge conflicts of
9600df0 to stage-aosp-master
am:
f120cf3d88
Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d
Jason Monk [Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)]
resolve merge conflicts of
9600df0 to stage-aosp-master
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
Yifan Hong [Tue, 6 Dec 2016 15:53:55 +0000 (15:53 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am:
5014028691 am:
1abe6def68
am:
fee17700af
Change-Id: I5b478eb2c8a6919ddaffa992b89ab1e01d63bb9e
Yifan Hong [Tue, 6 Dec 2016 15:45:33 +0000 (15:45 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am:
5014028691
am:
1abe6def68
Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f
Svet Ganov [Tue, 6 Dec 2016 15:39:07 +0000 (15:39 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
am:
a6dbd4934c
Change-Id: If21ce32f0c7e6652a4185c5f10c2157e078f8217
Yifan Hong [Tue, 6 Dec 2016 15:39:02 +0000 (15:39 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
am:
5014028691
Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c
Svet Ganov [Tue, 6 Dec 2016 15:39:01 +0000 (15:39 +0000)]
[DO NOT MERGE] Allow multiple toasts for the focused app
am:
296a60acc3
Change-Id: If076e3af0033447eb074ba45721205974cb763a4
TreeHugger Robot [Tue, 6 Dec 2016 15:19:52 +0000 (15:19 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
OSDN Git Service
