Commit Graph

301953 Commits

Author SHA1 Message Date
Lorenzo Colitti
38938279a4 Display "Sign into network" in settings when on a captive portal.
am: 1317e049f5

Change-Id: I9d15780cb49e365da98e09ba0149a8d31df4373c
2016-12-14 04:59:47 +00:00
Lorenzo Colitti
5625d486b9 Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev 2016-12-14 04:48:41 +00:00
David Stevens
4f9e88a4af Exit accessory mode more aggressively
The debouncing of USB disconnects means that the disconnect caused
by resetting the connection without unplugging the device does not make
it to the handler, and thus doesn't exit accessory mode. Therefore we
must exit accessory mode even for connect events after we have left the
entering accessory mode state.

Test: Manual testing with desktop head unit
Change-Id: Ia028ff28783fa777a9f8bcd86b523d01f633a140
2016-12-13 20:44:32 -08:00
Erik Kline
fc1b6a3f2a Stop setting net.hostname
Test: as follows
    - basics:
        - built
        - flashed
        - booted
    - connect to {v4-only, dualstack, v6-only} networks
        - verified expected connectivity on each
    - runtest frameworks-net
Bug: 30979015

Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f
2016-12-14 13:11:15 +09:00
Erik Kline
4539fb1884 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9 am: 94e328c22f am: 68700dc757
am: 6ba22b5d19

Change-Id: I3b3cade76fa364899f7e177483b42020238bf691
2016-12-14 03:42:47 +00:00
Erik Kline
6ba22b5d19 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9 am: 94e328c22f
am: 68700dc757

Change-Id: I7e587b8b45a722c085a1081321357b2f8e9e73c8
2016-12-14 03:35:45 +00:00
Erik Kline
68700dc757 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9
am: 94e328c22f

Change-Id: I4d46a9aa4b601098e55bf681906cb245d4d9a5cb
2016-12-14 03:29:10 +00:00
Erik Kline
94e328c22f Merge "DHCPv4 anonymity profile: support skipping hostname option"
am: eef38717b9

Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939
2016-12-14 03:22:12 +00:00
TreeHugger Robot
76c9a0d2f4 Merge "Add an IPC for requesting network scores." 2016-12-14 03:20:06 +00:00
Treehugger Robot
eef38717b9 Merge "DHCPv4 anonymity profile: support skipping hostname option" 2016-12-14 03:07:48 +00:00
Mark Lu
33ec106d22 docs: changes to broadcast documentation
- move BroadcastReceiver info to developer guide. see cl/140402421
- add usage note to CONNECTIVITY_ACTION broadcast

bug:32533262
bug:33106411

Change-Id: Ic2aa517831d29418e0c42aa6fc1e7f9aeb50f802
2016-12-13 18:28:32 -08:00
Julius D'souza
f9f39cc4a8 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController
is going idle.

The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b
2016-12-13 18:28:31 -08:00
Ruben Brunk
dfe0d7157d Fix VR interaction with screen on/off/lockscreen.
- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Test: Fix merge from nyc-mr2-dev.

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2
2016-12-13 18:26:08 -08:00
Matthew Ng
b5370b7f70 Fixes minimized state in DividerController when dismissing docked stack
When dismiss docked stack is dimissed without going back to multiwindow
mode, it will not set the mMinimizedDock to false. It will then assume
all interactions as minimized mode. Some issues occur such as trying to
go back into multiwindow mode will fail (leave the docked task docked
while launcher is shown behind it). It is possible to trigger a docked
stack dimissal with Activity.finish() from an app while in minimized
mode.

Test: manual - manually dismissed dock stack and tried to go back into
multiwindow mode
Change-Id: I2a8af3e6b9ea70a85e89adc7be50f31527af5c80
2016-12-13 18:05:55 -08:00
Christine Hallstrom
2830ce9a09 Add ability to set supported audio routes on phone accounts and connection
The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.

This is a cherry-pick of abandoned ag/1521009.

Bug: 32958838
Change-Id: Idd5e4d38b157f11454f3d991385644f2f384596e
2016-12-13 17:48:50 -08:00
Roozbeh Pournader
c9925480f1 Merge "Remove Droid Sans Fallback from all builds" 2016-12-14 01:38:17 +00:00
Kang Li
53b4314ad9 Add Sharing Histories to UsageStatsManager.
This CL is for Android O Smart-Sharing (b/30982298). By this CL, sharing
counts are logged with UsageStatsManager.

Bug: 30982298
Test: manual - shared images in Camera and texts in Chrome using a mobile device.

Change-Id: I0b4aa0506f99b3083d140a48f7b4bdd5b1c5afb6
2016-12-13 17:35:38 -08:00
Ruben Brunk
040484cf90 Fix VR interaction with screen on/off/lockscreen.
- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Merged-In: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2
2016-12-13 17:32:21 -08:00
Brad Ebinger
17acc15ca4 Add UI prompt for MMI code failure on 3gpp
Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
2016-12-13 17:16:00 -08:00
Adrian Roos
27014354cd Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev am: 3a39fe6bed
am: 4d5c17c161

Change-Id: Ief1f66530cd73206f95d7680eb19f6e78f173534
2016-12-14 01:14:07 +00:00
Adrian Roos
390a056474 Keyguard: Don't lock if SIM is NOT_READY am: e92de95261
am: 6f65fad606

Change-Id: If7fdff7be0851bb3f6141ca0a5362d964c415f5d
2016-12-14 01:13:05 +00:00
Michael Kwan
8a9b27773b Fix swipe-to-dismiss to properly react to swipe gestures.
Test: manual test
Bug: 33588580
Change-Id: If8d03f90a25e989e254e3a21bafef4e76bab5d7b
2016-12-13 17:10:12 -08:00
Adrian Roos
4d5c17c161 Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev
am: 3a39fe6bed

Change-Id: I0049f95c59f929a7b5dd4beb88e9b67887a9dcce
2016-12-14 01:07:08 +00:00
Adrian Roos
6f65fad606 Keyguard: Don't lock if SIM is NOT_READY
am: e92de95261

Change-Id: I3aaaa7099c7b114606e90c62ed3376369b0d86d2
2016-12-14 01:07:02 +00:00
Jeremy Joslin
b2087a159b Add an IPC for requesting network scores.
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.

Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG: 33593157
Change-Id: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
2016-12-13 17:06:56 -08:00
Philip P. Moltmann
ea10cc0fbb Do not write if apply() did not change the file.
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
2016-12-14 01:00:37 +00:00
Philip P. Moltmann
31d6889f4c 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
2016-12-14 00:56:03 +00:00
TreeHugger Robot
3a39fe6bed Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev 2016-12-14 00:55:41 +00:00
Chris Craik
2414e1b051 Outline & Path perf improvements
Bug: 33460152
Test: device boots, ViewShowHidePerfTests#add[Factory:NestedLinearLayoutTree,depth:6] 770us -> 650us (userdebug 960MHz bullhead)

Improve perf for outline & simple path methods

native_methodName -> nMethodName in Path.java

Change-Id: Id2374bbaca3256d2e4f19dae9abe67f794a171b3
2016-12-13 16:52:08 -08:00
Ruben Brunk
c32ebfb903 Merge "Prevent crash on uninstall." into nyc-mr2-dev am: f755dfb89e
am: ea566a0687

Change-Id: If7f409779796fe419475fc58b71b49c9d473c9aa
2016-12-14 00:42:47 +00:00
Ruben Brunk
58369e3d53 Prevent crash on uninstall. am: 12ab5e1d70
am: a1501095cf

Change-Id: I62bbc3c8e228b6dcda8d8edcb22d29634cabf271
2016-12-14 00:41:45 +00:00
TreeHugger Robot
201708ad89 Merge "Fix InputMonitor.updateInputWindowsLw" 2016-12-14 00:37:08 +00:00
Ruben Brunk
ea566a0687 Merge "Prevent crash on uninstall." into nyc-mr2-dev
am: f755dfb89e

Change-Id: I26ed997c0dcebe43199529f7871c1b94edc0e119
2016-12-14 00:35:05 +00:00
Ruben Brunk
a1501095cf Prevent crash on uninstall.
am: 12ab5e1d70

Change-Id: I8301d17bb0bbd16a4adeaadb7b7bd04ad7159407
2016-12-14 00:34:59 +00:00
Ruben Brunk
f755dfb89e Merge "Prevent crash on uninstall." into nyc-mr2-dev 2016-12-14 00:24:41 +00:00
Lei Yu
a0207a16a4 Merge "Remove qs_detail_empty and use colorForeground instead." 2016-12-14 00:12:46 +00:00
Marco Nelissen
0c57bd90b6 Merge "Remove AmrInputStream" am: 70b262b0f2 am: e57b37e423 am: b10837952a
am: 688fa0e9f0

Change-Id: I95947386bda60d69b5fb76dc00b2e7fb82d55878
2016-12-13 23:42:21 +00:00
Adrian Roos
ce8f096b5c DirectReply: Show bouncer when occluded
Fixes a bug where Direct Reply would not work when the
lockscreen is occluded.

Change-Id: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Merged-In: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Fixes: 32558539
Test: Open navigation, lock phone, turn phone on, direct reply to a notification
2016-12-13 15:36:05 -08:00
Marco Nelissen
688fa0e9f0 Merge "Remove AmrInputStream" am: 70b262b0f2 am: e57b37e423
am: b10837952a

Change-Id: I03203e4fdbe66aaa89aae54457cf334b71f676dc
2016-12-13 23:35:15 +00:00
George Burgess IV
5572d1607b Fix a memory leak.
This was caught by clang's static analyzer. Warning:
frameworks/base/media/mca/filterfw/native/core/shader_program.cpp:1031:3:
warning: Potential leak of memory pointed to by 'attrib.owned_data'
    return StoreAttribute(attrib);

Bug: None.
Test: The static analyzer no longer complains.
Change-Id: Ibef0368dfa48ba57e38019a5a3e33d5bacd847a2
2016-12-13 15:32:00 -08:00
Marco Nelissen
b10837952a Merge "Remove AmrInputStream" am: 70b262b0f2
am: e57b37e423

Change-Id: Ia95832144e831b91ba0f163db1da8ef8e7033446
2016-12-13 23:28:55 +00:00
Marco Nelissen
e57b37e423 Merge "Remove AmrInputStream"
am: 70b262b0f2

Change-Id: I46f8cf7847982e8ab590c9016472fea93aa4a27b
2016-12-13 23:22:14 +00:00
Sergei Vasilinetc
68a9dd8c88 Merge "HWUI: set correct sampler for external texture in shaders" 2016-12-13 23:19:47 +00:00
Adrian Roos
f37fce5182 DirectReply: Show bouncer when occluded
Fixes a bug where Direct Reply would not work when the
lockscreen is occluded.

Change-Id: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Merged-In: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Fixes: 32558539
Test: Open navigation, lock phone, turn phone on, direct reply to a notification
2016-12-13 15:19:29 -08:00
Marco Nelissen
70b262b0f2 Merge "Remove AmrInputStream" 2016-12-13 23:09:21 +00:00
Robert Carr
638e719b3a [DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 0bfaa461c6
am: 948eb32664  -s ours

Change-Id: I0be6bfecfbd2c9b4e0c5db8f577dc503bbbbeb57
2016-12-13 23:08:28 +00:00
Robert Carr
948eb32664 [DO NOT MERGE] Prevent crash from early Toast surface destruction.
am: 0bfaa461c6

Change-Id: I78c60bbb725cb3ea694f090e4f493c7a8247a41b
2016-12-13 23:02:22 +00:00
Junda Liu
6bb22e3de2 Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
Default false. If true, will allow use edited tether APN to take effect.

Bug: b/30622475
Change-Id: I526e41e816582e1c5219600d74980fd7754361e6
2016-12-13 14:53:53 -08:00
Roozbeh Pournader
aba60b542e Remove Droid Sans Fallback from all builds
Droid Sans Fallback is now completely replaced by Noto Sans CJK. The
font files are kept in the tree, since the SDK still needs them.

Also, Android.mk is updated to reflect the fact that Noto Color Emoji
is now included in SMALLER_FONT_FOOTPRINT, so fontchain_lint checks
for emoji consistency in that footprint too.

Bug: 31854008
Test: make fontchain_lint
Change-Id: I4f57114a48ecfaee87b49f01f7ef4fa5cd0b19fb
2016-12-13 22:53:52 +00:00
Adrian Roos
e92de95261 Keyguard: Don't lock if SIM is NOT_READY
Fixes an issue with MVNOs where the lockscreen
would show in response to a virtual SIM switch.

Now we no longer lock with NOT_READY.

Change-Id: I520200311a5ae3218f1743b1fc9a568c39933ebf
Fixes: 33386149
Bug: 30997251
Test: Set up secure lockscreen, insert Fi SIM, dial *#*#346398#*#*, verify screen does not lock, eject SIM, verify screen locks.
2016-12-13 14:53:49 -08:00