Internal method CallerInfo.getCurrentCountryIso() can throw NPE
if the country detector's detectCountry() method returns null.
Add code to check that the Country is not null before calling
getCountryIso() on it. Change fallback logic to call
locale.getCountry() whenever countryIso was not assigned.
Bug: 10607906
Change-Id: I08fe3f4d942f67c37a2e6ff0b067fe32ad8a6fa5
* commit '047b70886330f95da279b7f140ec89313412c034':
Fix ImageReader onImageAvailable synchronization
ImageReader: fix the 0 crop rect size issue
ImageReader: get correct crop size
media: Update ImageReader to remove MaxImagesAcquiredException
media: Update ImageReader APIs
Hide Experimental WebView from dev settings DO NOT MERGE
* commit '984001af8f5fa54d0619a9f4157c87126ae62d89':
Fix ImageReader onImageAvailable synchronization
ImageReader: fix the 0 crop rect size issue
ImageReader: get correct crop size
media: Update ImageReader to remove MaxImagesAcquiredException
media: Update ImageReader APIs
Hide Experimental WebView from dev settings DO NOT MERGE
* commit '4951ebb9659c8118051d873310754bb161614503': (78 commits)
wappush: Use valid index for pdu including garbages
ImageReader: fix the 0 crop rect size issue
Hide Experimental WebView from dev settings DO NOT MERGE
Clear names from externally supplied WorkSources to WifiManager (b/10733757)
Only show launcher for the bottom activity in a task
Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
Ensures that CompatibilityInfo is always set in Resources
Put soundpooled sounds in the right place.
Fix a regression in pausing activity immediately on sleep
TextureView/GLES20Canvas: Support synchronous GLConsumers
Debug for b/10689184.
Increasing visibility of pressed feedback for default ui widget assets
Use a separate thread for services that do NTP lookup
Also catch one more tablet layout NPE.
Fix tablet layout and resources.
New sounds for K.
Do not assign InputMethod to non-input windows.
Fix parenthetical error.
Fix media stress test.
Update the Connectivity Manager test suit to use InstrumentationTestCase.
...
* commit 'bf2993b1eddad61c24b60206eeeaf1fd0f01786b': (133 commits)
wappush: Use valid index for pdu including garbages
ImageReader: fix the 0 crop rect size issue
Hide Experimental WebView from dev settings DO NOT MERGE
Clear names from externally supplied WorkSources to WifiManager (b/10733757)
Only show launcher for the bottom activity in a task
Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
Ensures that CompatibilityInfo is always set in Resources
Put soundpooled sounds in the right place.
Fix a regression in pausing activity immediately on sleep
TextureView/GLES20Canvas: Support synchronous GLConsumers
Debug for b/10689184.
Increasing visibility of pressed feedback for default ui widget assets
Use a separate thread for services that do NTP lookup
Also catch one more tablet layout NPE.
Fix tablet layout and resources.
New sounds for K.
Do not assign InputMethod to non-input windows.
Fix parenthetical error.
Fix media stress test.
Update the Connectivity Manager test suit to use InstrumentationTestCase.
...
In the RemoteController implementation, the inner class that
implements the IRemoteControlDisplay interface must have a weak
link to the RemoteController instance with which it is associated,
as MediaFocusControl and RemoteControlClient hold a strong
reference to this binder object in a different remote process.
Without a weak reference, any object referencing RemoteController
couldn't be independently garbage collected without a garbage
collection in the remote process.
Bug 8209392
Change-Id: I29e4274c45249b3cb0d3d89417c69e8fe8f62fc4
It doesn't look good in the combo RSSI layout, and while we could make
it look better by adding some padding (like the airplane icon), we haven't
had a no_sim icon since ICS and people are pretty much OK with it.
This reverts commit 2eeacc02a252607e7c2fd1a00c60d8aa567694cc.
Bug: 11127588
Change-Id: Ibefd6096171588fcab1e3c5174abda9758cc5f6d
If a view triggers showContextMenu while a context menu is already
shown but contributes no items to the menu the menu dialog would
become empty. Simply close the dialog if this happens.
Bug 11063885
Change-Id: I9e7c96073318c94eda5f1e1c4beb596b3d9da781