OSDN Git Service
Bill Yi [Thu, 26 Jan 2017 07:14:36 +0000 (07:14 +0000)]
Import translations. DO NOT MERGE
am:
9c0c94c1b5 -s ours
Change-Id: I8c629cb66f2c962598e4ec221432c6d0c1ab6a85
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:37 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50 am:
b69d7554d7" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:21 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50 am:
44cafbb018" into nyc-mr2-dev-plus-aosp
Elliot Waite [Thu, 26 Jan 2017 04:45:59 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50
am:
b69d7554d7
Change-Id: I3222069c804f524d29eebb0bde502aec5a92c04f
Elliot Waite [Thu, 26 Jan 2017 04:45:49 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50
am:
44cafbb018
Change-Id: I77fd396040a31c69d98e3ca9d2bddd4f2632419f
Android Build Merger (Role) [Thu, 26 Jan 2017 04:45:36 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs. am:
54de77470d am:
ab978c035e am:
de2557f369" into nyc-mr2-dev-plus-aosp
Elliot Waite [Thu, 26 Jan 2017 04:44:56 +0000 (04:44 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e
am:
de2557f369
Change-Id: I3d4637ec03906dd520edaeadecdfe2fd4faa471b
Elliot Waite [Thu, 26 Jan 2017 04:44:54 +0000 (04:44 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e
am:
28ba4722a9
Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
Elliot Waite [Thu, 26 Jan 2017 04:40:54 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4
am:
6cc3802e50
Change-Id: I9b581b9a8be3d5d10abfbbc5770301fe67f94f78
Elliot Waite [Thu, 26 Jan 2017 04:40:47 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4
am:
6cc3802e50
Change-Id: I52ddc7a726e5b12d136e0e524225422e5e6aa1a6
Pavlin Radoslavov [Thu, 26 Jan 2017 04:40:43 +0000 (04:40 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163 am:
b3f1eaa504
am:
e667f7795f
Change-Id: Ia6722702175e196d5b980ec7be3a093e972cfbfb
Elliot Waite [Thu, 26 Jan 2017 04:39:57 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
Elliot Waite [Thu, 26 Jan 2017 04:39:53 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
Steve McKay [Thu, 26 Jan 2017 04:38:25 +0000 (04:38 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
am:
32e6da5b84
Change-Id: I7a90eb649be34b2f99af885ad4559fa9e1d5f727
Steve McKay [Thu, 26 Jan 2017 04:35:46 +0000 (04:35 +0000)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
am:
24cd592b24
Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
Elliot Waite [Thu, 26 Jan 2017 04:35:00 +0000 (04:35 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
am:
3366d4beb4
Change-Id: I90aa2e4ca0553d5816024486015514b3e5d7bc86
Pavlin Radoslavov [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163
am:
b3f1eaa504
Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
Elliot Waite [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Fix @links in reference docs.
am:
54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
TreeHugger Robot [Thu, 26 Jan 2017 04:31:36 +0000 (04:31 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
Pavlin Radoslavov [Thu, 26 Jan 2017 04:29:57 +0000 (04:29 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am:
0645c21163
Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
Elliot Waite [Thu, 26 Jan 2017 04:29:43 +0000 (04:29 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
Treehugger Robot [Thu, 26 Jan 2017 04:23:42 +0000 (04:23 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
Bill Yi [Thu, 26 Jan 2017 03:35:15 +0000 (19:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d22b911e1f4a4828ef3eb5eed69b3ccc112552e
Auto-generated-cl: translation import
Brad Ebinger [Thu, 26 Jan 2017 01:49:53 +0000 (01:49 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0 am:
64057ab972
am:
2741442324
Change-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f
Brad Ebinger [Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0
am:
64057ab972
Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
Brad Ebinger [Thu, 26 Jan 2017 01:41:38 +0000 (01:41 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
am:
8e6b13a1c0
Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b
Treehugger Robot [Thu, 26 Jan 2017 01:34:04 +0000 (01:34 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
Elliot Waite [Wed, 11 Jan 2017 23:30:35 +0000 (15:30 -0800)]
Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
Brad Ebinger [Mon, 23 Jan 2017 23:17:50 +0000 (15:17 -0800)]
Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option
Test: Unit Tests in opt/telephony
Bug:
30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
Pavlin Radoslavov [Wed, 25 Jan 2017 22:00:02 +0000 (14:00 -0800)]
Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"
Bug:
34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
Android Build Merger (Role) [Wed, 25 Jan 2017 21:31:03 +0000 (21:31 +0000)]
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am:
55772c73c0" into nyc-mr2-dev-plus-aosp
Jerry Zhang [Wed, 25 Jan 2017 21:30:07 +0000 (21:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
am:
55772c73c0
Change-Id: Ie41c7e8b7a687e9836354d429e66b5f214a6d0b2
Josh Gao [Wed, 25 Jan 2017 21:30:03 +0000 (21:30 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
273b886c49 am:
e801810553
am:
a07e5312cc
Change-Id: I9165a6dc33058ec4f7bd8a6c6f4426af405bda19
Josh Gao [Wed, 25 Jan 2017 21:25:23 +0000 (21:25 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
273b886c49
am:
e801810553
Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864
Jerry Zhang [Wed, 25 Jan 2017 21:23:54 +0000 (21:23 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am:
4882496232 -s ours
Change-Id: Ia50fbb88cdaa9e3570b68798b82df609475b5fe6
Jerry Zhang [Wed, 25 Jan 2017 21:22:54 +0000 (21:22 +0000)]
Clean up persistent usb state on boot.
am:
bfc5d563aa -s ours
Change-Id: Idd46b3f5a0c3a608a3178855b67afbce1cf21acb
Jerry Zhang [Wed, 25 Jan 2017 21:22:07 +0000 (21:22 +0000)]
Fixed handling of usb state during adb changes.
am:
541295a9a5 -s ours
Change-Id: I608202f6c74d0209f5507f838f103f874ed47e3b
Josh Gao [Wed, 25 Jan 2017 21:21:29 +0000 (21:21 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am:
273b886c49
Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7
Josh Gao [Wed, 25 Jan 2017 21:16:57 +0000 (21:16 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Steve McKay [Wed, 25 Jan 2017 18:19:06 +0000 (10:19 -0800)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
Bug:
34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
Jerry Zhang [Wed, 25 Jan 2017 20:30:17 +0000 (20:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
George Burgess IV [Wed, 25 Jan 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
500cf67206 am:
f77f2cb3e7
am:
0c6283e396
Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5
George Burgess IV [Wed, 25 Jan 2017 20:14:00 +0000 (20:14 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
500cf67206
am:
f77f2cb3e7
Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
George Burgess IV [Wed, 25 Jan 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am:
500cf67206
Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
Ruchi Kandoi [Wed, 25 Jan 2017 20:07:23 +0000 (20:07 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed am:
e6cb2aa614
am:
40c14a83d0
Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
Josh Gao [Wed, 25 Jan 2017 19:45:58 +0000 (11:45 -0800)]
zygote: don't drop CAP_SYS_PTRACE from the bounding set.
crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.
Bug: http://b/
34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4
Ruchi Kandoi [Wed, 25 Jan 2017 20:03:00 +0000 (20:03 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed
am:
e6cb2aa614
Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am:
f3a6269fed
Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"
Andre Eisenbach [Wed, 25 Jan 2017 18:23:50 +0000 (18:23 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f am:
36ce9b7ea0
am:
8b1d096e58
Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type
Bug:
20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Andre Eisenbach [Wed, 25 Jan 2017 18:19:51 +0000 (18:19 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f
am:
36ce9b7ea0
Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am:
35c715332f
Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys
Before
======
Enable log:
01-17 09:43:18 Enabled by com.android.systemui
01-18 07:13:10 Disabled by com.andorid.systemui
1 BLE Apps registered:
com.google.android.gms
After
=====
Enable log:
02-06 07:49:07 Enabled by system boot
02-06 07:49:35 Disabled by com.andorid.systemui
1 BLE App registered:
com.google.android.gms
Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:47 +0000 (16:08 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am:
a60f7151e6
Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:41 +0000 (16:08 +0000)]
Decrease frequency of high temp warnings
am:
97bfa0f17d
Change-Id: I48237148a12cbf8b11df798001aa5c99428a6daa
Andrew Sapperstein [Wed, 25 Jan 2017 16:01:04 +0000 (16:01 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
Tobias Thierer [Wed, 25 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798 am:
b8557c431d
am:
6a5fccdc66
Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4
Tobias Thierer [Wed, 25 Jan 2017 11:40:33 +0000 (11:40 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798
am:
b8557c431d
Change-Id: I074661952d4d8b67cdba3038f564d29329469bab
Tobias Thierer [Wed, 25 Jan 2017 11:35:11 +0000 (11:35 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
am:
815fb54798
Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56
Tobias Thierer [Wed, 25 Jan 2017 11:29:42 +0000 (11:29 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
Peter Qiu [Wed, 25 Jan 2017 03:26:19 +0000 (03:26 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1 am:
55d23d0829
am:
c11689de2f
Change-Id: Icb6bd9db5058b11cc27174acf616a8d751041d1d
Peter Qiu [Wed, 25 Jan 2017 03:21:49 +0000 (03:21 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1
am:
55d23d0829
Change-Id: Ia7d1beb9a1ebd55a72c403f9ed159f55b491b10b
Peter Qiu [Wed, 25 Jan 2017 03:17:19 +0000 (03:17 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
am:
123aa5d8b1
Change-Id: If8164839812728361fcd3d9b2f37c481ccf9b33c
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Peter Qiu [Wed, 25 Jan 2017 02:19:45 +0000 (02:19 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578 am:
6570ce6c80
am:
704f1bfea4
Change-Id: I0ad0256eb12fd4c255dd0c27d7ec8b90d42ccbdc
Peter Qiu [Wed, 25 Jan 2017 02:15:44 +0000 (02:15 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578
am:
6570ce6c80
Change-Id: I8c232cc7d246b28943d16c1f28121597dad8f215
Peter Qiu [Wed, 25 Jan 2017 02:11:10 +0000 (02:11 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
am:
28c7afe578
Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
Andrew Sapperstein [Wed, 25 Jan 2017 00:38:50 +0000 (16:38 -0800)]
Decrease frequency of high temp warnings
Instead of showing any time the temp is above throttling temp,
if the user has dismissed the notification (or clicked it), the notification
will not reshow until the temperature has gone below the throttling
temp and come back.
Test: manual
Change-Id: I4cef9144dfcff03a5e70ccd5b12efaab1e74d15b
Fixes:
34346625
Adrian Roos [Wed, 25 Jan 2017 00:30:43 +0000 (00:30 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
am:
ae5d4ff831
Change-Id: Ib76e1da3dbd8b55ff55b3df2f040380e86fd3c35
Adrian Roos [Wed, 25 Jan 2017 00:30:35 +0000 (00:30 +0000)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout
am:
4749930c37
Change-Id: Id664ebb3c07271ff5282daedd29c7f38e79c8776
TreeHugger Robot [Wed, 25 Jan 2017 00:24:33 +0000 (00:24 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
Peter Qiu [Wed, 11 Jan 2017 21:39:35 +0000 (13:39 -0800)]
hotspot2: add support for complete PerProviderSubscription/Credential subtree
Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc
Peter Qiu [Wed, 11 Jan 2017 19:01:02 +0000 (11:01 -0800)]
hotspot2: add support for complete HomeSP subtree
Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c
George Burgess IV [Tue, 24 Jan 2017 23:48:28 +0000 (15:48 -0800)]
Fix a use-of-uninitialized-value warning.
Caught by clang's static analyzer:
frameworks/base/core/jni/android_hardware_SoundTrigger.cpp:660:20:
warning: Assigned value is garbage or undefined
nHandle[0] = (jint)handle;
Given that we return an error code anyway, we can just set it to 0 and
move on.
Bug: None
Test: Still builds; static analyzer doesn't complain.
Change-Id: I9a5be562a0d96fd6c48bb98eca0867fc754bba63
Chris Tate [Tue, 24 Jan 2017 23:46:58 +0000 (23:46 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5 am:
3a13bb43f6
am:
6793b1f0b8
Change-Id: I16e1b48e818023243f2c05e43599432f59203a19
Chris Tate [Tue, 24 Jan 2017 23:42:33 +0000 (23:42 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5
am:
3a13bb43f6
Change-Id: I44fcb1ff849d39ff528adb85f8d76563eb9b9d52
Chris Tate [Tue, 24 Jan 2017 23:38:12 +0000 (23:38 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
am:
36654ffef5
Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea
Chris Tate [Tue, 24 Jan 2017 23:31:34 +0000 (23:31 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
Torbjorn Eklund [Tue, 24 Jan 2017 22:57:27 +0000 (22:57 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" am:
a9c27b348c am:
8e9cf51db3
am:
3cd1f5bac7
Change-Id: I7f6c497adfb1dcbfeb5342c639008af5d28d1892
Torbjorn Eklund [Tue, 24 Jan 2017 22:52:59 +0000 (22:52 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" am:
a9c27b348c
am:
8e9cf51db3
Change-Id: I7fbc47d01539202c4a9d022dc6609bc88e1d4621
Torbjorn Eklund [Tue, 24 Jan 2017 22:49:27 +0000 (22:49 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
am:
a9c27b348c
Change-Id: Ia57e460220a5f8e53f47f2454f5c1a005830a3e6
Treehugger Robot [Tue, 24 Jan 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
Siyamed Sinir [Tue, 24 Jan 2017 22:27:36 +0000 (22:27 +0000)]
Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev
am:
9e1f4e8891
Change-Id: If12164005160599947f591ee97a1d0a9af2f732e
Siyamed Sinir [Tue, 24 Jan 2017 22:27:28 +0000 (22:27 +0000)]
Make SpannableStringBuilder.getSpans thread-safe
am:
4234144a2b
Change-Id: I9d1c2d93d6f22465c88e35df28d75f07bcc687b3
Siyamed Sinir [Tue, 24 Jan 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev
Siyamed Sinir [Tue, 24 Jan 2017 22:09:00 +0000 (22:09 +0000)]
Merge "Fix SpannableStringBuilder getSpans sort" into nyc-mr2-dev
am:
48d84c378b
Change-Id: I3935b667dd120825e13252ad13a63b027ebf4a49
Siyamed Sinir [Tue, 24 Jan 2017 22:08:56 +0000 (22:08 +0000)]
Fix SpannableStringBuilder getSpans sort
am:
051caedcaa
Change-Id: I6d4a4d3b5810d47809458bcd1e1dce9567363da6
Siyamed Sinir [Tue, 24 Jan 2017 22:05:01 +0000 (22:05 +0000)]
Merge "Fix SpannableStringBuilder getSpans sort" into nyc-mr2-dev
Jerry Zhang [Wed, 12 Oct 2016 22:49:32 +0000 (15:49 -0700)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.
It also simplifies some of the code.
Bug:
31814300
Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit
7a396be6d5ba8914933a54b5bfac25e118db0e9f)
Torbjorn Eklund [Tue, 24 Jan 2017 20:59:25 +0000 (20:59 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" into nyc-mr2-dev
am:
5bfedd8af0
Change-Id: I06c5832785ff29e2e6b9ee835c14394c56ad4e60
Torbjorn Eklund [Tue, 24 Jan 2017 20:59:20 +0000 (20:59 +0000)]
Vodafone SIMs should treat Spain as roaming
am:
137271738e
Change-Id: Ife67a10b2cb21418c256e70869e70bf5af78840c
TreeHugger Robot [Tue, 24 Jan 2017 20:55:07 +0000 (20:55 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" into nyc-mr2-dev
Andrew Sapperstein [Tue, 24 Jan 2017 20:08:53 +0000 (20:08 +0000)]
Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev
am:
0a26aa9b31
Change-Id: Idfd2a48cadb54adcb5f6976ec1a2caf7181db78a
Andrew Sapperstein [Tue, 24 Jan 2017 20:08:42 +0000 (20:08 +0000)]
Add Settings.Global configs to high temp warning.
am:
63db9254cf
Change-Id: I63de4c9648158d8b19ed5d7eac1e75ca9b68d355
TreeHugger Robot [Tue, 24 Jan 2017 20:02:22 +0000 (20:02 +0000)]
Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev
Adrian Roos [Mon, 5 Dec 2016 23:42:16 +0000 (15:42 -0800)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout
Fixes a bug in MessagingLinearLayout where we would not
recompute the height of it after applying the computed
insets to the text views, leading to incorrect padding
and in rare cases a cut off message at the bottom.
Change-Id: If87a527555158e94e501832e9f49e380cc7da2bb
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java
Fixes:
31463075
(cherry picked from commit
4ac8f40d96196a2a36d7bda7d92eee9bbd4ee7e7)
OSDN Git Service
