gps: allow xta data over default mobile connection

If the default mobile data connection is up and
connected, use that connection to download xta data.

Change-Id: Ic5ff5422ac9baf83ac923faeb1f8b4fc9186c184
CRs-fixed: 399721
frameworks/base:When turn off of SoftAp immediately call turning ON SoftAp

Due to SSR3,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: Ia280ac3269062dcff9888b2cbad6ac14f6dbc79e
CRs-fixed: 426941
Merge "frameworks/base:When turn off of SoftAp immediately call turning ON SoftAp"
Eliminate potential reentrance from unregisterInputChannel.

Ensure that all callbacks into the window manager policy occur
on the input dispatcher thread in the right place.  This fixes
a potential deadlock that may occur if the window manager
unregisters an input channel while holding its own lock.

The change is simply to defer running asynchronous commands
(usually callbacks into the policy) until the next iteration
of the dispatch looper thread.

Bug: 7382388
Change-Id: I90095580d717fcddb2209ef332df56400f837a34
Merge "Eliminate potential reentrance from unregisterInputChannel."
ActivityManager:Idle Screen Text not displayed on Home/Idle screen

Hook into the entrypoint for Activitys to determine when
the Home/Idle Screen Activity is being started. When this
happens, broadcast intent that we are on the idle screen,
so that STKAppService can display idle screen text.

CRs-fixed: 423228

Change-Id: Ie790f7dab1f68fe4c0a699816c96f33ec9586267

Conflicts:

	services/java/com/android/server/am/ActivityManagerService.java
Merge "ActivityManager:Idle Screen Text not displayed on Home/Idle screen"
Frameworks: Add + for international number for MT SMS

Add + if international number is not having + at starting.

Change-Id: Ie7fb0ec807296117ddc9298b374f94234c9e5330
CRs-Fixed: 368589
Merge "Frameworks: Add + for international number for MT SMS"
Bluetooth: Avoid updating the UUID while turning off Bluetooth

EventLoop received UUID property while doing the state machien cleanup
it looks for the object path from the properties buy by that time
the properties got cleared as part of state cleanup,
becasue  of the null object path null pointer exception is seen.

CRs-fixed: 458935

Change-Id: I78f50da25998ac720d099a34aa49369fc5d25ba2
Merge "Bluetooth: Avoid updating the UUID while turning off Bluetooth"
Tighten enforcement of file modes.

Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
(cherry picked from commit 4ec11d41564c5a3018a748dc392aca83dfe1d75d)
Merge "Tighten enforcement of file modes."
server: provide indication of net-admin tasks for wifi

Send an indication to link manager when net-admin tasks such as route
addition and dns setup are finished for wifi.

(cherry picked from commit ca585155a63375600677c99f0a570a105887e031)

Change-Id: I25fb50d9a7ef21d020db619a656b2b606b991177
CRs-fixed: 423673
CNE: Fix wakelock acquisitions after updateBlockedUid trigger.

Blocked Uids acquiring wakelocks after the updateBlockedUid
trigger could lead to device not going to power collapse.

(cherry picked from commit c7704edd9e7241427161e472117b52346e3f6bc9)

Change-Id: I081d661b2dea404bae8e0e52601e3f589c043250
CRs-fixed: 414717
cne: dynamic enable disable of WQE via a UI

Implementation for FR 9132: Create android application which provides
UI for enabling/disabling WQE feature. Register CNE class as a system
service in SystemServer class. Add support for dynamically enabling/
disabling WQE feature to ConnectivityService, CnE java and native
layers.

CRs-fixed: 448815

Change-Id: I52d3d96e3cf56ec59a0363cf5262b92c08f746be

Conflicts:

	services/java/com/android/server/ConnectivityService.java
Gaurd against wake lock being released internally.

NSRM(network socket request manager) could release wake locks
internally when it is blocking socket calls for a uid, do not
throw an exception if wake lock not found when nsrm is enabled.

Change-Id: I95d11059c4ab687a51c073445b998ebb58a64424
CRs-fixed: 440820
Don't release wakelock for uid 1000 (android package)

Change-Id: Iee176181a142181d50befa0bdc06e4283c3470de
CRs-fixed: 440820
server: handle default net change in vpn

Notify VPN of interface status changed when default network is switched.

Change-Id: I8b1700aef4f3e9437af0673092b747dd91df27f9
CRs-fixed: 461260
Pick default interface for upstream.

With multiple upstream interfaces active and connected,
we should choose the default interface for upstream.

Change-Id: I98a21fc30965120c2aaa8859ef05fe53efa51f40
CRs-fixed: 461266