302884 Commits

Author SHA1 Message Date
Michal Karpinski
54b7388163 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 2017-01-13 09:47:24 +00:00
Erik Kline
21a148550d Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e
am: a94e66868c

Change-Id: Ie4d1cf3ef1729fc92de6a209a66e2e1ad386fb32
2017-01-13 07:18:55 +00:00
Erik Kline
ca6d265bbe Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6
am: 7340e272c3

Change-Id: Ie5065a8224e392dafc75e9f9cd9e07587e46b814
2017-01-13 07:17:47 +00:00
Erik Kline
a94e66868c Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
am: caf62d305e

Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892
2017-01-13 07:11:47 +00:00
Erik Kline
7340e272c3 Move explicit mobile request handling into UpstreamNetworkMonitor
am: fdd4111ef6

Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03
2017-01-13 07:11:43 +00:00
Treehugger Robot
caf62d305e Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" 2017-01-13 07:03:17 +00:00
Winson Chung
27379c0f89 Merge "Ensure that we always resume task overlay activities if requested." 2017-01-13 07:02:51 +00:00
Keisuke Kuroyanagi
846946ec06 Merge "Make selection end handle stick to selection at line end." 2017-01-13 06:39:22 +00:00
Erik Kline
fdd4111ef6 Move explicit mobile request handling into UpstreamNetworkMonitor
Also:
    - some minor typo fixes
    - some minor style fixes
    - variable renames for clarity

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - regular (no DUN) wifi tethering to mobile works
    - USB tethering with switching between mobile and wifi works
Bug: 32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a
2017-01-13 14:09:57 +09:00
pkanwar
e45b50293e DO NOT MERGE: Fix to maintain the Carrier Network connection.
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.

BUG: 30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
2017-01-12 19:25:52 -08:00
Chris Craik
36d9a6dfba Support shadows and reordering in ViewOverlay
Bug: 32726440
Test: manual
Change-Id: Ic5d7efdee5a493b7768b9db8150f65f97b3f0a64
2017-01-12 19:17:19 -08:00
Sundeep Ghuman
7a9612f032 Fix ScoredNetwork: unparcel bundle in toString.
Calling isEmpty will ensure the bundle is unparceled before converting
to a string.

Test: dumped network_score
Change-Id: Icaa4e736af55c6112805a2ce0e829739bbb5b312
2017-01-12 18:45:52 -08:00
Manu Cornet
f67d4498ce Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev am: 2660111259
am: 4c7317373c  -s ours

Change-Id: I7054561b72b89871318e17c2948c69a85bd654d5
2017-01-13 02:42:05 +00:00
Manu Cornet
fcff84c732 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents am: da5900d0a7
am: afd96a08b1  -s ours

Change-Id: Ifbec27e0e264fc9a3303da18fdcb75a3cb4bd7d1
2017-01-13 02:40:56 +00:00
Manu Cornet
4c7317373c Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
am: 2660111259

Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
2017-01-13 02:36:06 +00:00
Manu Cornet
afd96a08b1 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
am: da5900d0a7

Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
2017-01-13 02:36:02 +00:00
Chen Xu
c90dc2072c Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
2017-01-13 02:33:24 +00:00
TreeHugger Robot
2660111259 Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 2017-01-13 02:31:13 +00:00
Chen Xu
1d0877f59e Merge "Default Carrier app for traffic mitigation"
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
2017-01-13 02:28:28 +00:00
Eugene Susla
c1facb81e0 Merge "Only send cache event if cache is detected to be used" 2017-01-13 02:26:38 +00:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
Bo Hu
82b0bcceba Merge "Emulator: remove hardcoded isEmulator() logic in ImageWallpaper" 2017-01-13 02:16:26 +00:00
Roozbeh Pournader
cf246af30d Treat Latin American locales specially
Due to legacy reasons, Android translations of European Spanish were
kept under 'es', while Latin American Spanish translations were kept
under 'es-US'. The combination of this, and the new locale
preference rules in Nougat, resulted in 'es' winning over 'es-US' for
all Latin American locales, since 'es' was a direct ancestor, while
'es-US' was just a fallback.

The changes in Nougat had assumed that app developers would put Latin
American Spanish translations under 'es-419', but that could create a
backward-compatibility problem under older Android versions that did
not support three-digit region codes properly.

This CL keeps the Nougat logic and its locale parent tree, but
special-cases es-US and es-MX to be treated as equivalents of es-419
in cases where they are present and es-419 is not.

Bug: 31545805
Bug: 34126460
Test: unit tests are included
Change-Id: Iab26f41294587ee044685a5a6560520c7cbb06f7
(cherry picked from commit a192a8ced65ceea8bfe44f0eac6a394cbf80d936)
2017-01-13 01:54:01 +00:00
Roozbeh Pournader
383ac409df Merge "Treat Latin American locales specially" 2017-01-13 01:53:15 +00:00
Winson Chung
cbcadc981b Ensure that we always resume task overlay activities if requested.
- Distinguish between task overlays that need to be resumed and
  those that should not.

Bug: 34240533
Test: Open PiP, tap to show menu.
Change-Id: Ibdb54d544c501a492260f02cdc2de40c5c1a66d1
2017-01-12 17:23:18 -08:00
Andrew Sapperstein
6c08f8da09 Add logging for high temp warning.
Adds a log line that prints the current and throttling temps
when we decide to show the notification.

Test: manual
Bug: 34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
2017-01-12 17:23:11 -08:00
Daniel Nishi
2f0b45ab60 Initialize the Installer in the StorageStatsService.
Without this, the Installer never connects to the underlying
installd service, which results in NPEs when the service is used.

Bug: 34261458
Test: builds and runs w/o crashing
Change-Id: I9222c26cf6e411710e07a74f29b019f7c5754316
2017-01-12 17:19:50 -08:00
Philip P. Moltmann
764a7901e6 Do not write if apply() did not change the file. am: 1f99f81bdc
am: 331a4bb8d4

Change-Id: I068dcbfcdaffff85379d422a9c53aafe7caa01c2
2017-01-13 01:17:30 +00:00
Philip P. Moltmann
0aa5138861 Only persist last Shared Preferences state am: d15c4f1da5
am: 889a420a9e

Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015
2017-01-13 01:16:23 +00:00
Hakan Seyalioglu
79b69f06d2 Only test the empty state in the right test.
Test: Ran the test

Change-Id: I03908540d85830dd1165f1672fe49716df55d7a0
2017-01-12 17:15:24 -08:00
Philip P. Moltmann
331a4bb8d4 Do not write if apply() did not change the file.
am: 1f99f81bdc

Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1
2017-01-13 01:10:01 +00:00
Philip P. Moltmann
889a420a9e Only persist last Shared Preferences state
am: d15c4f1da5

Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
2017-01-13 01:09:03 +00:00
Manu Cornet
569cbecd92 DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
Bug: 32101881
Test: Checked layout in various situations when switching orientation
Change-Id: Iae1f142f6568890512e24787d78cfb1e15280feb
2017-01-13 01:07:43 +00:00
Manu Cornet
da5900d0a7 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
Bug: 32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
2017-01-13 01:05:17 +00:00
TreeHugger Robot
423f949594 Merge "Add logging constants for Settings search screen" 2017-01-13 00:51:22 +00:00
Philip P. Moltmann
1f99f81bdc Do not write if apply() did not change the file.
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
2017-01-12 16:43:30 -08:00
Philip P. Moltmann
d15c4f1da5 Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit 31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)
2017-01-12 16:42:59 -08:00
Manu Cornet
7eac56c726 Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev am: 5ee87b5b6a
am: ae5df0544a

Change-Id: I4f606540611dc5afaa9577c03afae8b7fc00528f
2017-01-13 00:36:25 +00:00
Manu Cornet
a4e29361b6 2D Recents: Use a different task dismiss animation am: 5df7667edb
am: bc6bdb3ef8

Change-Id: Ia6eddc26efd3ab101f575bdb06b10691a2346cbc
2017-01-13 00:35:10 +00:00
Manu Cornet
ae5df0544a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
am: 5ee87b5b6a

Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
2017-01-13 00:28:26 +00:00
Manu Cornet
bc6bdb3ef8 2D Recents: Use a different task dismiss animation
am: 5df7667edb

Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
2017-01-13 00:28:19 +00:00
Manu Cornet
5ee87b5b6a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 2017-01-13 00:23:48 +00:00
Daniel Nishi
d85d85394e Fix a near instant stats permission check false negative.
The MODE_DEFAULT enforcePermission behavior fell through to
the switch default case, even if the calling permission was
granted.

Bug: 34258237
Test: Manual
Change-Id: I823fb4dc3657c15eb1fa3d12d4f4c7e1e9e21cd5
2017-01-12 16:10:57 -08:00
fionaxu
a21a87b7a4 Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
2017-01-12 15:50:18 -08:00
Ashutosh Joshi
8fa60ce20e Merge "Add a callback handler for nanoApp aborts." 2017-01-12 23:50:06 +00:00
Ta-wei Yen
a5a2e6d1b1 Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-12 23:48:06 +00:00
Android Build Merger (Role)
96a3d9c7ca Merge "Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26 am: 907585c004" 2017-01-12 23:26:39 +00:00
TreeHugger Robot
fac595ae56 Merge "Add activity action for Configure Wi-Fi settings." 2017-01-12 23:25:50 +00:00
Robert Greenwalt
f299153487 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26
am: 907585c004

Change-Id: I05a4da02d0253eec03174277be22fc2daabad774
2017-01-12 23:25:36 +00:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
2017-01-12 23:20:45 +00:00