OSDN Git Service

DO NOT MERGE - cherry pick a Bluetooth property fix from master
authorMatthew Xie <mattx@google.com>
Tue, 17 Apr 2012 18:39:02 +0000 (11:39 -0700)
committerJason Simmons <jsimmons@google.com>
Thu, 14 Jun 2012 18:44:06 +0000 (11:44 -0700)
commit61c0fc41e170c7dd5d7969be80fdf108d9d52f14
treea5a211ce1b58a1926dd1961e46fb546be6c232b0
parent8f267c4a47fa65193c39635675a536468d5d4296
DO NOT MERGE - cherry pick a Bluetooth property fix from master

Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.

When we fail to get the property, print out warning message, turn
Discoverable off.
Bug 6302990

Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757
core/java/android/server/BluetoothService.java