GitLab

empty -s ours merge

Change-Id: I6cfeced57f7c36e771b349f65a1a3e13e199890e

Change-Id: I4e78ced9628cd22fb59a17749f2ac9ce75ddbf73

Change-Id: I7df2d63cc2c51b79d98b4889687a8035453d125e

Change-Id: I0ac6da326a7a4d15acc84d0301688ca2f4a6ed9a

Change-Id: I3c6cda860dbf7574608e79cc36d481d5c7f75565

Change-Id: I7069f3d2be0bb43238df3ce3dc585f7b9a9edb53

* commit '50c85944':
  Match INetworkPolicyListener changes.

Change-Id: I78b6b0380a42b28f42334f93e0538ba7f32bc66d

* commit 'dc8940b5':

* commit '71d3ff5d':

* commit '55231bc5':

Change-Id: Ibd173b02bfba0a495cd0ec5df37154c269c87b91

* commit '2404bcad':
  Import translations. DO NOT MERGE

Change-Id: I28f97070ecefc2538afa0ab4eddad99628b60286

* commit '515cf53e':
  Move away from deprecated NetworkInfo extra.

Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: Ie7a143e621e5a3a013ec6d8b8613709e7787dc0c

* commit 'b1a4b7d4':
  Import translations. DO NOT MERGE

Change-Id: If9cd930e2e9c04bc1a3120992811f0b0e88a927a

* commit 'ac71f70c':
  Update DownloadProvider for new Intent.normalizeMimeType() API.

Change-Id: Ideeb8cbeaa4b4d82d7c9fc8197a35bf3541a22d7

* commit 'ca11088a':

* commit '3ddc6cc0':

Change-Id: Ia5f0f8633b530dd4f551be4776206639b926fc18

* commit '23bb4b4f':
  Allow downloads when no network restriction set.

* commit '380044a2':
  Allow downloads when no network restriction set.

* commit 'f720bc68':
  Allow downloads when no network restriction set.

* commit 'f720bc68':
  Allow downloads when no network restriction set.

Fixes bug where DownloadManager would block downloads on WiMAX,
bluetooth, and ethernet networks, even when no network restrictions
had been set.

Bug: 5689335
Change-Id: I6d1bb78cbccb3c5eb1fce40a13b0689be0c3fa13

* commit 'b1d7241f':
  Import revised translations.

Change-Id: Ic00709623c5be406b3f83000ff821860af754b71

* commit 'a67beb7a':

* commit '13a08957':

* commit 'f774814b':
  Use UID instead of PID.

Change-Id: I994f92ebc9d80a912db2c4f1aa9100ba94daad5f

* commit '4fded8cf':

Change-Id: Icd5311e1b9183fbbfd51d05f6fc1719037528e3c

* commit 'a318a7fc':
  Import revised translations.  DO NOT MERGE