OSDN Git Service
Jakub Pawlowski [Fri, 17 Mar 2017 23:09:10 +0000 (23:09 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f am:
07d79aa3b0
am:
acd3953ea1
Change-Id: Ic2c7bd33d558bb4e8cfff063c95f2fa137aeaae0
TreeHugger Robot [Fri, 17 Mar 2017 23:06:09 +0000 (23:06 +0000)]
Merge "Show friction icons in Saved Networks list."
TreeHugger Robot [Fri, 17 Mar 2017 23:04:30 +0000 (23:04 +0000)]
Merge "Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji"
TreeHugger Robot [Fri, 17 Mar 2017 22:49:17 +0000 (22:49 +0000)]
Merge "Update fontchain_lint.py to read Emoji 5.0 data"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
9aa841d254 am:
4992b1533e
am:
a7c4fdbf03
Change-Id: Iea9ee9c4a407638dfa19669b25d0c1534978d4a6
Jakub Pawlowski [Fri, 17 Mar 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f
am:
07d79aa3b0
Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7
Jakub Pawlowski [Fri, 17 Mar 2017 22:34:24 +0000 (22:34 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
am:
d9f2f67a5f
Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:34:01 +0000 (22:34 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
9aa841d254
am:
4992b1533e
Change-Id: I00c97934ad59e996844831ee23ace60813d3ce0c
TreeHugger Robot [Fri, 17 Mar 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Update references to removed APIs"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:11 +0000 (22:27 +0000)]
Merge "Add new precise call fail causes and OEM causes"
am:
9aa841d254
Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897
Jakub Pawlowski [Fri, 17 Mar 2017 22:24:04 +0000 (22:24 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 18:12:15 +0000 (11:12 -0700)]
Bluetooth 5 move timeout parameter (1/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.
Test: manual
Bug:
30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
Peter Qiu [Fri, 17 Mar 2017 22:23:30 +0000 (22:23 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am:
5bd337397b am:
8951172562
am:
79ff52975f
Change-Id: I80cdbc7f0140e6085c06cab8eaba63e1fc455538
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add new precise call fail causes and OEM causes"
Peter Qiu [Fri, 17 Mar 2017 22:16:22 +0000 (22:16 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am:
5bd337397b
am:
8951172562
Change-Id: I3799156a83400d9fa1aa07a4afd935bd9c0f683b
Peter Qiu [Fri, 17 Mar 2017 22:08:21 +0000 (22:08 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
am:
5bd337397b
Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b
Yohei Yukawa [Fri, 17 Mar 2017 22:05:16 +0000 (22:05 +0000)]
Merge "Deprecate IMM#showSoftInputUnchecked() part 1"
Treehugger Robot [Fri, 17 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
TreeHugger Robot [Fri, 17 Mar 2017 21:46:08 +0000 (21:46 +0000)]
Merge "Fix libplatformproto includes/export includes"
TreeHugger Robot [Fri, 17 Mar 2017 21:38:47 +0000 (21:38 +0000)]
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"
Roozbeh Pournader [Fri, 17 Mar 2017 19:40:20 +0000 (12:40 -0700)]
Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji
These had remained in Emoji.java although they were removed from Unicode
emoji. The data still needs to be updated to Emoji 5.0, but that will be
done in another CL.
Test: not needed
Bug:
28678294
Change-Id: I491c4bba107b960fb1efccbe19630ab274aa6e29
TreeHugger Robot [Fri, 17 Mar 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Code clean up: remove some dead code."
Alan Viverette [Fri, 17 Mar 2017 21:01:58 +0000 (21:01 +0000)]
Merge "Allow the support library to add its own droiddoc options"
TreeHugger Robot [Fri, 17 Mar 2017 20:48:28 +0000 (20:48 +0000)]
Merge "Send broadcast when user restrictions change."
Alan Viverette [Fri, 17 Mar 2017 20:46:20 +0000 (16:46 -0400)]
Update references to removed APIs
Test: make PRODUCT-sdk_google_aw_x86-sdk
Change-Id: I8e13f43520e609808a9825fa3c89f4233076c5a9
Brian Carlstrom [Fri, 17 Mar 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Dump native stack for background ANR if process is of interest"
TreeHugger Robot [Fri, 17 Mar 2017 20:22:36 +0000 (20:22 +0000)]
Merge "QS: Revert change to when user switcher is shown"
Dan Willemsen [Fri, 17 Mar 2017 20:05:20 +0000 (13:05 -0700)]
Fix libplatformproto includes/export includes
The host versions of these were pointing to the target generated
sources, without having proper dependencies added. But the build system
already handles these adding these to your local and exported include
directories, so just remove them.
Bug:
36365556
Test: m -j libhwui incident_report incident-section-gen
Change-Id: I52024508eabd8d10899c307c950fe045ff66ab25
Makoto Onuki [Fri, 17 Mar 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix deadlock between activity manager and settings provider"
Fan Zhang [Fri, 17 Mar 2017 19:55:21 +0000 (12:55 -0700)]
Code clean up: remove some dead code.
Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
Alan Viverette [Fri, 17 Mar 2017 19:47:09 +0000 (19:47 +0000)]
Merge "Revert "Changing initial and default focus behavior""
Sundeep Ghuman [Wed, 15 Mar 2017 23:03:55 +0000 (16:03 -0700)]
Show friction icons in Saved Networks list.
Bug: b/
34802842
Test: $ make SettingsFunctionalTests -j40
$ adb install -r
$ {OUT}/data/app/SettingsFunctionalTests/SettingsFunctionalTests.apk
$ adb shell am instrument -w \
'android.settings.functional/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I0d6aedad2aabb40ef532283a755cb5c954e8139d
Peter Qiu [Fri, 17 Mar 2017 16:39:11 +0000 (09:39 -0700)]
hotspot2: implement toString for PasspointConfiguration
Bug:
35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
Conrad Chen [Fri, 17 Mar 2017 19:39:37 +0000 (19:39 +0000)]
Merge "Block modifying types of channels"
Evan Rosky [Fri, 17 Mar 2017 19:39:15 +0000 (12:39 -0700)]
Revert "Changing initial and default focus behavior"
This is a soft revert.
This reverts commit
37df2dbab124452e04bf14784df9ab5c2f64e434
Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2
TreeHugger Robot [Fri, 17 Mar 2017 19:37:57 +0000 (19:37 +0000)]
Merge "Adding an extras Bundle to MessagingStyle messages."
TreeHugger Robot [Fri, 17 Mar 2017 19:19:40 +0000 (19:19 +0000)]
Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays"
Robin Lee [Thu, 16 Mar 2017 17:19:42 +0000 (17:19 +0000)]
Make SYNC_PARENT_SOUNDS a @SystemApi
Since there is a CTS test depending on it which is currently hardcoding
the string. Let's not do that.
Bug:
30658854
Test: make full -j30
Change-Id: I6f6b1044ac664589b8fe76ced9961e80024b0b29
Makoto Onuki [Fri, 17 Mar 2017 18:50:13 +0000 (11:50 -0700)]
Fix deadlock between activity manager and settings provider
Test: manual
Bug
36028906
Change-Id: I20344608d79d174b468506056789c04d3bde510f
Jason Monk [Fri, 17 Mar 2017 18:49:47 +0000 (14:49 -0400)]
QS: Revert change to when user switcher is shown
Its making it inconsistently show up on the lock screen. Until
final behavior is decided, revert to old behavior.
Change-Id: Ifc69f2d5b527cc9ce5a174b16b8b605db26fc35b
Fixes:
36141544
Test: visual
Diego Perez [Fri, 17 Mar 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Fix BitmapShader to work with adaptive icons"
TreeHugger Robot [Fri, 17 Mar 2017 17:57:26 +0000 (17:57 +0000)]
Merge "Disable large-ish parcel logging."
TreeHugger Robot [Fri, 17 Mar 2017 17:54:30 +0000 (17:54 +0000)]
Merge "Removed 'virtual' from autofill method names."
TreeHugger Robot [Fri, 17 Mar 2017 17:51:40 +0000 (17:51 +0000)]
Merge "Adding enabled state for remote actions."
Roshan Pius [Fri, 17 Mar 2017 17:40:54 +0000 (17:40 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am:
f5fa26bf25 am:
da34226f06
am:
9205ccf3ee
Change-Id: I33a6f328a4373c323bfe1b2de59273faf5c03695
Roshan Pius [Fri, 17 Mar 2017 17:39:37 +0000 (17:39 +0000)]
Merge "WifiConfiguration: Update psk documentation" am:
89c79ff632 am:
6b6f1b9e12
am:
28212c1b29
Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09
Roshan Pius [Fri, 17 Mar 2017 17:34:10 +0000 (17:34 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am:
f5fa26bf25
am:
da34226f06
Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6
Roshan Pius [Fri, 17 Mar 2017 17:33:06 +0000 (17:33 +0000)]
Merge "WifiConfiguration: Update psk documentation" am:
89c79ff632
am:
6b6f1b9e12
Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
Andrii Kulian [Fri, 17 Mar 2017 17:30:50 +0000 (10:30 -0700)]
Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays
MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.
Bug:
34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0
Roshan Pius [Fri, 17 Mar 2017 17:28:13 +0000 (17:28 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
am:
f5fa26bf25
Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
Roshan Pius [Fri, 17 Mar 2017 17:26:57 +0000 (17:26 +0000)]
Merge "WifiConfiguration: Update psk documentation"
am:
89c79ff632
Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
TreeHugger Robot [Fri, 17 Mar 2017 17:26:18 +0000 (17:26 +0000)]
Merge "Allow Instant Apps access PackageInfo of exposed apps"
Treehugger Robot [Fri, 17 Mar 2017 17:18:31 +0000 (17:18 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
Treehugger Robot [Fri, 17 Mar 2017 17:17:50 +0000 (17:17 +0000)]
Merge "WifiConfiguration: Update psk documentation"
Tomasz Wasilczyk [Fri, 17 Mar 2017 16:34:50 +0000 (16:34 +0000)]
Merge "Add getProgramList call to the broadcast radio API."
Jerome Gaillard [Fri, 17 Mar 2017 16:29:32 +0000 (16:29 +0000)]
Merge "Update ColorFilter_Delegate following Change I5f74addd"
Jeff Sharkey [Fri, 17 Mar 2017 16:25:07 +0000 (10:25 -0600)]
Disable large-ish parcel logging.
This logging was originally added to track down very large log
messages that were causing Binder transactions to fail. We fixed
a handful of bugs that could have been causing this over in
32575987,
so this logging should no longer be needed in live builds. (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)
Test: builds, boots
Bug:
36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da
TreeHugger Robot [Fri, 17 Mar 2017 16:11:32 +0000 (16:11 +0000)]
Merge "Fix up QS edit UI"
Felipe Leme [Fri, 17 Mar 2017 00:13:25 +0000 (17:13 -0700)]
Removed 'virtual' from autofill method names.
Fixes:
36126001
Test: VirtualContainerActivityTest pass
Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f
Neil Fuller [Fri, 17 Mar 2017 15:50:31 +0000 (15:50 +0000)]
Merge "Track library change in libcore." am:
ed9c176e16 am:
301f1d3645
am:
cef08e7482 -s ours
Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa
Brian Carlstrom [Sat, 11 Mar 2017 08:14:13 +0000 (00:14 -0800)]
Dump native stack for background ANR if process is of interest
Bug:
30112521
Bug:
36043456
Bug:
35241370
Test: make -j32 -k && flashall
Change-Id: I25b134ec24c534f3cfeb5a7c43195da3a6285d57
Roshan Pius [Thu, 16 Mar 2017 18:07:07 +0000 (11:07 -0700)]
WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.
Bug:
35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
Neil Fuller [Fri, 17 Mar 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Track library change in libcore." am:
ed9c176e16
am:
301f1d3645
Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
Roshan Pius [Thu, 16 Mar 2017 17:59:58 +0000 (10:59 -0700)]
WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.
Bug:
35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
Andrii Kulian [Fri, 17 Mar 2017 15:39:32 +0000 (15:39 +0000)]
Merge "Separate global and override config sent to client"
Neil Fuller [Fri, 17 Mar 2017 15:38:01 +0000 (15:38 +0000)]
Merge "Track library change in libcore."
am:
ed9c176e16
Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
TreeHugger Robot [Fri, 17 Mar 2017 15:32:02 +0000 (15:32 +0000)]
Merge "Change dependency to standard mockito-target-minus-junit4"
Treehugger Robot [Fri, 17 Mar 2017 15:28:35 +0000 (15:28 +0000)]
Merge "Track library change in libcore."
TreeHugger Robot [Fri, 17 Mar 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Protect against hiding while not attached"
Diego Perez [Wed, 15 Mar 2017 12:45:39 +0000 (12:45 +0000)]
Fix BitmapShader to work with adaptive icons
Test: Existing test should pass
Change-Id: Ie4c78eab4dfacf1eb6060d71edb98b836c4eff78
liangweikang [Fri, 17 Mar 2017 15:07:50 +0000 (15:07 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java" am:
c14d5db093 am:
79e9f380e2
am:
9b0784aa5f
Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650
liangweikang [Fri, 17 Mar 2017 14:57:55 +0000 (14:57 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java" am:
c14d5db093
am:
79e9f380e2
Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068
liangweikang [Fri, 17 Mar 2017 14:51:58 +0000 (14:51 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
am:
c14d5db093
Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
TreeHugger Robot [Fri, 17 Mar 2017 14:48:11 +0000 (14:48 +0000)]
Merge "Removing 'delegate' from constant names"
Treehugger Robot [Fri, 17 Mar 2017 14:43:20 +0000 (14:43 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
Jason Monk [Fri, 17 Mar 2017 14:04:31 +0000 (10:04 -0400)]
Fix up QS edit UI
Turns out QS Edit mode didn't like the changes to dual target tiles.
Clean this up a bit.
Test: visual
Change-Id: I158fe8dba6729de102cfc592314ec483a969417d
Paul Duffin [Tue, 14 Mar 2017 16:37:39 +0000 (16:37 +0000)]
Change dependency to standard mockito-target-minus-junit4
The mockito-updated-target-minus-junit4 target was added because
some tests needed a later version of mockito than was available
through mockito-target-minus-junit4. Since the latter has now
been upgraded to 2.7.13 that is no longer true and so users of
mockito-updated-target-minus-junit4 can be switched to use
mockito-target-minus-junit4 instead.
Bug:
32912773
Test: make checkbuild && runtest systemui
Change-Id: If7e4dd26d7d0e93731856e9739a048c89a835333
Jason Monk [Fri, 17 Mar 2017 13:47:30 +0000 (09:47 -0400)]
Protect against hiding while not attached
Change-Id: I44b16d2644c80c737ffc16bf11cc1259e3c3984b
Fixes:
36137783
Test: Edit QS
Julia Reynolds [Fri, 17 Mar 2017 12:32:23 +0000 (08:32 -0400)]
Removing 'delegate' from constant names
Change-Id: I2ac4e3ae08f1084da34ea74fdd5177e2d58987af
Fixes:
35812334
Test: build
Jerome Gaillard [Fri, 17 Mar 2017 12:15:36 +0000 (12:15 +0000)]
Update ColorFilter_Delegate following Change I5f74addd
Test: layoutlib tests
Change-Id: Ifb18946edb0c40e0120868e211c99a304801e740
Neil Fuller [Wed, 22 Feb 2017 18:29:47 +0000 (18:29 +0000)]
Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.
Bug:
31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
Neil Fuller [Wed, 22 Feb 2017 18:29:47 +0000 (18:29 +0000)]
Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.
Bug:
31008728
Test: make
Change-Id: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Narayan Kamath [Fri, 17 Mar 2017 10:05:14 +0000 (10:05 +0000)]
Merge "fd_utils: address a couple of TODOs." am:
eae1ae9732 am:
a34d01d1ee
am:
8497b653f6
Change-Id: Ic8735187a22df886f07da887f12dddff248d1028
Narayan Kamath [Fri, 17 Mar 2017 09:58:12 +0000 (09:58 +0000)]
Merge "fd_utils: address a couple of TODOs." am:
eae1ae9732
am:
a34d01d1ee
Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375
Narayan Kamath [Fri, 17 Mar 2017 09:51:35 +0000 (09:51 +0000)]
Merge "fd_utils: address a couple of TODOs."
am:
eae1ae9732
Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6
Narayan Kamath [Fri, 17 Mar 2017 09:44:11 +0000 (09:44 +0000)]
Merge "fd_utils: address a couple of TODOs."
Narayan Kamath [Thu, 2 Mar 2017 17:30:03 +0000 (17:30 +0000)]
fd_utils: address a couple of TODOs.
Drink the android::base koolaid.
Test: make, boots
Change-Id: Ib24b9b59fa3490e80ba78be0199eafa676225b73
TreeHugger Robot [Fri, 17 Mar 2017 08:15:55 +0000 (08:15 +0000)]
Merge "Fixed cancel() and commit():"
TreeHugger Robot [Fri, 17 Mar 2017 06:42:58 +0000 (06:42 +0000)]
Merge "Sets accessibility title for autofill dataset picker."
Jakub Pawlowski [Fri, 17 Mar 2017 05:31:07 +0000 (05:31 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)" am:
74f2e1a303 am:
2fc3834f4d
am:
066e8551f1
Change-Id: If9ee85705e7c47820e23ad79a048e4c04c4cc11a
Jakub Pawlowski [Fri, 17 Mar 2017 05:26:26 +0000 (05:26 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)" am:
74f2e1a303
am:
2fc3834f4d
Change-Id: Iad555280f5d702c63c76a2399c8d02ac39749a77
Jakub Pawlowski [Fri, 17 Mar 2017 05:19:57 +0000 (05:19 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
am:
74f2e1a303
Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
Jakub Pawlowski [Fri, 17 Mar 2017 05:13:44 +0000 (05:13 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
TreeHugger Robot [Fri, 17 Mar 2017 04:09:50 +0000 (04:09 +0000)]
Merge "Added a new AutofillCallback.EVENT_INPUT_UNAVAILABLE event."
TreeHugger Robot [Fri, 17 Mar 2017 04:06:46 +0000 (04:06 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
Roshan Pius [Fri, 17 Mar 2017 03:59:36 +0000 (03:59 +0000)]
Merge "WifiConfiguration: Update psk documentation"
Joel Scherpelz [Fri, 17 Mar 2017 03:05:45 +0000 (03:05 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am:
52f8421b77 am:
b8933942fc
am:
f9cd5cd81b
Change-Id: I5ebbe1a63da43f28b0d582bc7e6480ffe74195b7
liangweikang [Thu, 16 Mar 2017 11:22:15 +0000 (19:22 +0800)]
[BUG] fix NullPointerException in Notification.java
https://code.google.com/p/android/issues/detail?id=252835
Test: null
Change-Id: I6c575686c75b02ac938f35622b522fff25403c29
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Joel Scherpelz [Fri, 17 Mar 2017 02:59:11 +0000 (02:59 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am:
52f8421b77
am:
b8933942fc
Change-Id: Ic1b6226da3cfb68eeb352c1f81df09733ab52e4d
Joel Scherpelz [Fri, 17 Mar 2017 02:53:11 +0000 (02:53 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am:
52f8421b77
Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb