OSDN Git Service
Robin Lee [Tue, 19 Apr 2016 19:25:40 +0000 (19:25 +0000)]
Merge "Unit test for UidRange.java and UidRange.cpp" into nyc-dev
Robin Lee [Tue, 19 Apr 2016 19:19:42 +0000 (19:19 +0000)]
Merge "Move UidRange aidl declaration to system/netd" into nyc-dev
Phil Burk [Tue, 19 Apr 2016 19:10:52 +0000 (19:10 +0000)]
Merge "MidiService: fix resource leak" into nyc-dev
Raph Levien [Tue, 19 Apr 2016 18:31:04 +0000 (18:31 +0000)]
Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev
Jason Monk [Tue, 19 Apr 2016 18:19:29 +0000 (18:19 +0000)]
Merge "Increase contrast on edit button" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 18:17:01 +0000 (14:17 -0400)]
Increase contrast on edit button
Change-Id: I2d7eefabe9becc93e83aa6d245c42797ee966543
Fixes:
28180748
Dianne Hackborn [Tue, 19 Apr 2016 18:10:26 +0000 (18:10 +0000)]
Merge "Work on issue #
28221912: Starting service as foreground might..." into nyc-dev
Dianne Hackborn [Tue, 19 Apr 2016 18:10:13 +0000 (18:10 +0000)]
Merge "Fix issue #
28250286: Missing equals!" into nyc-dev
Jeff Sharkey [Tue, 19 Apr 2016 17:58:22 +0000 (17:58 +0000)]
Merge "Ignore user serial numbers in core-only mode." into nyc-dev
Pavel Zhamaitsiak [Tue, 19 Apr 2016 17:41:40 +0000 (17:41 +0000)]
Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev
Jeff Sharkey [Tue, 19 Apr 2016 17:39:42 +0000 (11:39 -0600)]
Ignore user serial numbers in core-only mode.
When booting in core-only mode, our data partition is a tmpfs which
doesn't support xattrs, so we can't set/enforce user serial numbers.
Bug:
28254840
Change-Id: Id83c551c7c603a4cd5043e06f7161441b2dfaa8b
Bo Liu [Tue, 19 Apr 2016 17:39:15 +0000 (17:39 +0000)]
Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev
Samuel Tan [Tue, 19 Apr 2016 17:25:31 +0000 (17:25 +0000)]
Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev
Jeff Sharkey [Tue, 19 Apr 2016 17:11:19 +0000 (17:11 +0000)]
Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev
Jeff Sharkey [Tue, 19 Apr 2016 17:10:54 +0000 (17:10 +0000)]
Merge "Disable "defusable" logging for now." into nyc-dev
Steve McKay [Tue, 19 Apr 2016 17:10:24 +0000 (17:10 +0000)]
Merge "Handle null uris in content changed events." into nyc-dev
Eric Laurent [Tue, 19 Apr 2016 17:04:59 +0000 (17:04 +0000)]
Merge "AudioSystem: allow platforms no audio ports" into nyc-dev
Siyamed Sinir [Tue, 19 Apr 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Request re-layout after setText if layout width is 0" into nyc-dev
Selim Cinek [Tue, 19 Apr 2016 16:47:20 +0000 (09:47 -0700)]
Fixed a rebase gone wrong with pageindicator
The return statement was lost.
Change-Id: Ica403337bf9dce2c0b1c2447a0aa4359f991ac0d
Fixes:
27927374
Alan Viverette [Tue, 19 Apr 2016 16:39:13 +0000 (16:39 +0000)]
Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 16:39:08 +0000 (16:39 +0000)]
Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 16:20:47 +0000 (16:20 +0000)]
Merge "Fix QS edit overanimating" into nyc-dev
Andrii Kulian [Tue, 19 Apr 2016 16:19:04 +0000 (16:19 +0000)]
Merge "Recreate activity with correct configuration" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 16:07:15 +0000 (12:07 -0400)]
Fix QS edit overanimating
Tell it when to animate, that way it can't animate too much.
Change-Id: I0acdd780e76a4a0b0d5ed5e2805c44dc59306fc1
Fixes:
27315295
Baligh Uddin [Tue, 19 Apr 2016 15:45:34 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:56 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:48 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:44 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 15:29:18 +0000 (15:29 +0000)]
Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 15:19:45 +0000 (15:19 +0000)]
Merge "No QS hotspot unless supported" into nyc-dev
Tony Mak [Tue, 19 Apr 2016 15:15:20 +0000 (15:15 +0000)]
Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:45:31 +0000 (14:45 +0000)]
Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:45:14 +0000 (14:45 +0000)]
Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 14:17:00 +0000 (10:17 -0400)]
Use adjusted popup window position when calculating best-fit
Bug:
28194522
Bug:
28175404
Change-Id: I5685b397908f64559d0ec5fea5820bdea69f422c
Jason Monk [Tue, 19 Apr 2016 13:31:20 +0000 (09:31 -0400)]
No QS hotspot unless supported
Fixes:
27438917
Change-Id: Iadeee5a87ebb9b881e04ac706547004e186215ea
Eric Tang [Tue, 19 Apr 2016 13:38:05 +0000 (13:38 +0000)]
Merge "update string "Work profile" to "All work apps"" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 13:36:24 +0000 (13:36 +0000)]
Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 13:29:20 +0000 (09:29 -0400)]
Call OnTimeChangedListener on AM/PM change in clock-style TimePicker
Bug:
28257554
Change-Id: I25aabac783ea2b6e68be4b6c60f0d55a4c37af26
Tony Mak [Tue, 19 Apr 2016 13:02:44 +0000 (14:02 +0100)]
Set lock screen to be in public mode if one of its profile is secure
Change-Id: I7d819c7d4a52ff45705b1a1b9e215faf0957cccb
Fix:
27118634
Julia Reynolds [Tue, 19 Apr 2016 12:50:32 +0000 (12:50 +0000)]
Merge changes I01afb5e9,I90d1adaf into nyc-dev
* changes:
Add content intent to autogroup summary.
Logging for ranker bundling.
Tony Mak [Tue, 19 Apr 2016 10:32:29 +0000 (10:32 +0000)]
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
Andrei Stingaceanu [Tue, 19 Apr 2016 09:59:51 +0000 (09:59 +0000)]
Merge "Keyboard shortcuts: UI polish 2" into nyc-dev
Seigo Nonaka [Tue, 19 Apr 2016 09:54:50 +0000 (18:54 +0900)]
Delete emojis before and after ZWJ at the same time.
Vendor may want to introduce their own ZWJ emoji sequence. To delete
them by one back space as the same behavior of Unicode emoji sequence,
use all emoji as the zwj emoji.
Bug:
28248662
Change-Id: I572dad42ee108476962d4b3fe9f3a6019cb50098
Baligh Uddin [Tue, 19 Apr 2016 08:37:35 +0000 (01:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4de249a3fbf0c6d3faad2b3bb233be596c5ca815
Auto-generated-cl: translation import
Diego Perez [Tue, 19 Apr 2016 07:34:16 +0000 (07:34 +0000)]
Merge "Separate measure so it can only run inflate if needed" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 07:08:03 +0000 (07:08 +0000)]
Merge "Remove unused DHCP timeout event tag." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 06:09:36 +0000 (06:09 +0000)]
Merge "Optimize some binder calls when recents configuration changes" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 05:35:40 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25911f2c3a9ae2ea463f096e187350f96983310f
Auto-generated-cl: translation import
Hugo Benichi [Tue, 19 Apr 2016 02:53:43 +0000 (11:53 +0900)]
Remove unused DHCP timeout event tag.
DHCP timeouts should not be logged at DHCPClient level but as a timeout
event in IpManager.
Bug:
28204408
Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff
Baligh Uddin [Tue, 19 Apr 2016 05:09:26 +0000 (22:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cba5a5c47981751f6134338855f3bd2cbdd9eb1
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Apr 2016 05:03:13 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2388d59a03f62e7e4617b64e85a552f49001a208
Auto-generated-cl: translation import
Jorim Jaggi [Mon, 18 Apr 2016 23:03:36 +0000 (16:03 -0700)]
Optimize some binder calls when recents configuration changes
Bug:
28122871
Change-Id: I54249428792c3ad4b3b6d3dcc0f405675b3b23b4
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:11:15 +0000 (04:11 +0000)]
Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev
Andrii Kulian [Tue, 19 Apr 2016 03:54:20 +0000 (20:54 -0700)]
Recreate activity with correct configuration
Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.
This CL updates configuration when activity is created from
override config.
Bug:
27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f
Selim Cinek [Tue, 19 Apr 2016 02:54:46 +0000 (02:54 +0000)]
Merge changes Id1aab629,Idb24dbd4 into nyc-dev
* changes:
Fixed a few issues when adapting the dpi
Fixed a few issues with status bar density changes
Selim Cinek [Tue, 19 Apr 2016 02:53:01 +0000 (02:53 +0000)]
Merge "Fixed a crash when changing density with HUN visible" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 02:29:05 +0000 (02:29 +0000)]
Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 02:09:33 +0000 (02:09 +0000)]
Merge "Added extra validation for invalid paths." into nyc-dev
Winson Chung [Tue, 19 Apr 2016 01:32:36 +0000 (01:32 +0000)]
Merge changes Ibec23fdb,Id7be5129,I25af8fad,Idbabfe39,I86b10805, ... into nyc-dev
* changes:
Hiding clear-all button on drag start.
Adding hint text for drop targets.
Fixing animation spec animation problem.
Making the dismiss animation feel smoother.
Fixing issue with gap between task views.
Adding desired undocking animation.
Winson [Mon, 18 Apr 2016 23:58:33 +0000 (16:58 -0700)]
Hiding clear-all button on drag start.
Bug:
27702186
Change-Id: Ibec23fdb1ce4853f52a449cbe6d8c6454f0b027c
Winson [Mon, 18 Apr 2016 23:57:27 +0000 (16:57 -0700)]
Adding hint text for drop targets.
Bug:
28192178
Change-Id: Id7be5129488622b56082d2dfa328b751311cabd7
Winson [Mon, 18 Apr 2016 19:57:56 +0000 (12:57 -0700)]
Fixing animation spec animation problem.
- We were always using the stack layout to get the task transforms, but
when we are animating to a given task position (ie. hitting recents
while the home->recents transition is happening), we would start the
animation with the final task rect, instead of the current task rect.
Instead, use the current transform of the task view, and transform
that to screen coordinates and use it.
Bug:
27154882
Change-Id: I25af8fad97ee78669c952dd81708e6cee5dfab05
Winson [Sat, 16 Apr 2016 02:06:54 +0000 (19:06 -0700)]
Making the dismiss animation feel smoother.
Bug:
27154882
Change-Id: Idbabfe396bc75b598861fd12b78c846f08243a90
Winson [Sat, 16 Apr 2016 00:54:52 +0000 (17:54 -0700)]
Fixing issue with gap between task views.
- Now that we changed the way the landscape tasks clipped, we no longer
have to worry about the aspect ratio scaled height.
Bug:
27921659
Change-Id: I86b10805e92decb9995caa3790649f9f7d211784
Winson [Fri, 15 Apr 2016 18:19:07 +0000 (11:19 -0700)]
Adding desired undocking animation.
- Separating task binding from task data updating
- Removing unused parameters
Bug:
27154882
Change-Id: Ia970597d57857a74b5d008e91a93703d8fb70c1e
Chris Thornton [Mon, 18 Apr 2016 23:51:08 +0000 (16:51 -0700)]
Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==
Also refactors ModelData::clearState to clear a bit more of the state.
Bug:
28251543
Change-Id: I18d7ccd90a6a9ee8bc8743d9a92c48f17d87c842
TreeHugger Robot [Tue, 19 Apr 2016 00:47:27 +0000 (00:47 +0000)]
Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev
Pavel Zhamaitsiak [Tue, 19 Apr 2016 00:41:19 +0000 (17:41 -0700)]
Add wrappers for IConnectivityMetricsLogger functions
Bug:
25691077
Change-Id: I51fa34a4815fb04e33d3b02f0134e3555afc3900
Steve McKay [Tue, 19 Apr 2016 00:35:41 +0000 (17:35 -0700)]
Handle null uris in content changed events.
Bug:
28244958
Change-Id: Id3a7adb0ab4a751cfcf6ed3fee4cc6337ce512bb
Craig Donner [Tue, 19 Apr 2016 00:10:53 +0000 (00:10 +0000)]
Merge "Checks for existence of vr components before trying to disable them." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 00:03:59 +0000 (00:03 +0000)]
Merge "Use right starting window resource in multi-window mode." into nyc-dev
Dianne Hackborn [Mon, 18 Apr 2016 23:53:52 +0000 (16:53 -0700)]
Fix issue #
28250286: Missing equals!
Change-Id: I85073a1a8a0a37362a0c73a71d0e7c12ce9cfeef
Phil Burk [Mon, 18 Apr 2016 23:05:28 +0000 (16:05 -0700)]
MidiService: fix resource leak
The proxy object was being used to match when adding or removing objects.
But they are different each time. So now we use an asBinder() object.
Bug:
28153736
Change-Id: I1bccebf1e9464668db757ff08b41902d0cf0e3a7
Signed-off-by: Phil Burk <philburk@google.com>
Robin Lee [Tue, 5 Apr 2016 11:19:06 +0000 (12:19 +0100)]
Unit test for UidRange.java and UidRange.cpp
Verifies that:
- UidRange only accepts non-negative UIDs
- UidRange only accepts start UID <= stop UID
- Native implementation is in sync with java implementation (via JNI)
Change-Id: I8b412781efe9cfda6d5e666e37fe0d8f5e2b6ecc
Adam Powell [Mon, 18 Apr 2016 23:41:39 +0000 (23:41 +0000)]
Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
Adam Powell [Mon, 18 Apr 2016 18:01:55 +0000 (11:01 -0700)]
Be bug-compatible with Fragment#setUserVisibleHint < N
Prior to Android N we were simply checking if a fragment had a
FragmentManager set before we would trigger a deferred
start. Unfortunately this also gets set before a fragment transaction
is committed, so if setUserVisibleHint was called before a transaction
commit, we would start the fragment way too
early. FragmentPagerAdapter triggers this situation.
Unfortunately some apps relied on this timing in overrides of
setUserVisibleHint on their own fragments, and expected, however
erroneously, that after a call to super.setUserVisibleHint their
onStart methods had been run.
Bug
28184671
Change-Id: Ie40d5f6963d312c2fad4a48fb4f992d33e65c83b
Yang Ni [Mon, 18 Apr 2016 23:34:04 +0000 (23:34 +0000)]
Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev
Craig Donner [Mon, 18 Apr 2016 22:50:57 +0000 (15:50 -0700)]
Checks for existence of vr components before trying to disable them.
Fixes:
28249296
Change-Id: I98506c263387c9deb05ae6bc997e92e0000b71ad
Adam Lesinski [Mon, 18 Apr 2016 23:27:08 +0000 (23:27 +0000)]
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
John Reck [Mon, 18 Apr 2016 23:20:37 +0000 (23:20 +0000)]
Merge "Make getFrameNumber lazy" into nyc-dev
Wale Ogunwale [Mon, 18 Apr 2016 23:14:18 +0000 (16:14 -0700)]
Properly resume paused activity when docked stack in maximized
Force focus to the fullscreen stack so that its activity is resumed
regardless of it current state when moving all tasks from the docked
stack to the fullscreen stack and the fullscreen stack should be on
top.
Bug:
28247643
Bug:
28196862
Change-Id: Ic60c3794db765e9ee31b0facbbc4f461d65f30c2
Sailesh Nepal [Mon, 18 Apr 2016 22:36:38 +0000 (22:36 +0000)]
Merge "[Call Timing] Add constants for call timing extras" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 22:23:42 +0000 (22:23 +0000)]
Merge "Use Activity resources in DecorContext" into nyc-dev
Siyamed Sinir [Mon, 18 Apr 2016 21:32:47 +0000 (14:32 -0700)]
Request re-layout after setText if layout width is 0
When TextView is in a layout with weight params (i.e. LinearLayout) and
the width is set to 0, do not try to prevent requestLayout.
Bug:
27995311
Change-Id: Idfe9d8d0b595a6db95beb1afd83ca96a2bd46546
Selim Cinek [Mon, 11 Apr 2016 01:35:54 +0000 (09:35 +0800)]
Fixed a few issues when adapting the dpi
The statusbar is now behaving nicer and other
parts are behaving similar as if they had been inflated
that way. The signalclusterview is now properly recreated
ensuring that it's scaled correclty.
Fixes:
26844819
Change-Id: Id1aab629204d03c079815358e7a5eb12d2a4e557
Selim Cinek [Sun, 10 Apr 2016 04:24:45 +0000 (21:24 -0700)]
Fixed a few issues with status bar density changes
Reinflated the brightnessmirror to have the propper layouting.
Also fixed the height of the heads up scrim.
Bug:
26844819
Change-Id: Idb24dbd40f071a2a722c59cc202ae46c5ace2da8
Selim Cinek [Sun, 10 Apr 2016 03:43:40 +0000 (20:43 -0700)]
Fixed a crash when changing density with HUN visible
The Quick settings page indicator was trying to access views that
don't exist yet.
Fixes:
27927374
Change-Id: I1600ce8432b6550268da20443d32193b1d2debe4
Wale Ogunwale [Sat, 16 Apr 2016 22:08:48 +0000 (15:08 -0700)]
Use right starting window resource in multi-window mode.
Use the override configuration for the task the app is contained
in to generate resources for the starting window.
Bug:
28220001
Change-Id: I6fdf39a6d6de41287b44b25861a76f58fe58dd53
Adam Lesinski [Tue, 12 Apr 2016 03:03:01 +0000 (20:03 -0700)]
Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.
Bug:
27198799
Change-Id: I1ccb6e93cc213810848f07d631d9d8de7c719803
Chong Zhang [Mon, 18 Apr 2016 22:01:08 +0000 (22:01 +0000)]
Merge "Misc fixes for IME adjust" into nyc-dev
Felipe Leme [Mon, 18 Apr 2016 21:55:15 +0000 (14:55 -0700)]
Added extra validation for invalid paths.
In normal circumstances, StorageVolume can only be obtained through
StorageManager and hence it will contain a valid path internally. But
the path could be invalid in at least 2 occations:
- App maliciously changed it using reflection.
- Mounted volume was ejected.
This change improves OpenExternalDirectoryActivity so it returns a
RESULT_CANCELED upon receiveving an invalid path.
BUG:
27962875
Change-Id: Ide43968babaa37961c7b704bd289f44eac952e94
Chong Zhang [Fri, 15 Apr 2016 19:03:11 +0000 (12:03 -0700)]
Misc fixes for IME adjust
- Use thinner divider when IME adjusted
- Dim non-focused stack
- Restrict IME adjustment so that top pane is shrunk to 30% at most
- Move top stack up together with IME adjust
- Move bottom stack up even when not focused for thinner divider
bug:
28175599
Change-Id: I83556535e5a171f0ec28d88429186fa1315b910c
Dianne Hackborn [Mon, 18 Apr 2016 20:55:25 +0000 (13:55 -0700)]
Work on issue #
28221912: Starting service as foreground might...
...kill previous notification.
Add new platform API to detach a notification from a service
without dismissing it.
Also, while I am here, add some more @IntDefs.
Change-Id: I3bb46d9cd3db7f73716c8ced19c20fea800eb30d
Jeff Sharkey [Mon, 18 Apr 2016 21:36:39 +0000 (15:36 -0600)]
Unlock should always wait for pending PRE_BOOT.
While processing an unlock request, we might go async to handle
long-running operations like dispatching PRE_BOOT_COMPLETED. This
change ensures that all unlock requests for a particular user wait
in line behind any pending async operations.
Without this CL, any subsequent unlock requests would immediately
return successful, even though PRE_BOOT_COMPLETED events were still
being processed.
Bug:
28240584
Change-Id: I307d6aaebfb8f38028f3666a2e19e4399b7cf3a7
John Reck [Mon, 18 Apr 2016 21:34:18 +0000 (14:34 -0700)]
Make getFrameNumber lazy
Change-Id: I783de544ad9a3636ea90f1c8c4034738997bfbc8
Fixes:
28246085
Yang Ni [Mon, 18 Apr 2016 21:27:02 +0000 (14:27 -0700)]
Fixed ScriptGroup finalizer for old API
Bug:
28242626
ScriptGroup finalizer clears out the list of closures, which is
uninitialized for the old API.
Need to check null first, before accessing the list.
Change-Id: Ibf914e17a0878c8c561f823c5f6f6f6619594de1
Wei Wang [Mon, 18 Apr 2016 21:17:24 +0000 (21:17 +0000)]
Merge "Use ConnectivityThread for RttManager." into nyc-dev
Jim Miller [Mon, 18 Apr 2016 21:09:51 +0000 (21:09 +0000)]
Merge "Fix operator precedence bug causing a crash." into nyc-dev
Jim Miller [Mon, 18 Apr 2016 20:00:40 +0000 (13:00 -0700)]
Fix operator precedence bug causing a crash.
This fixes a bug where string expression was being evaluated
and then compared to null. The result is a constant expression
which always passes, resulting in inadvertently accessing the
null variable.
Fixes bug
28237450
Change-Id: I755b4466fd1985bd7f8984c17e06839ac4a30642