193986 Commits

Author SHA1 Message Date
John Spurlock
dfe8044160 Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev 2015-06-03 15:17:55 +00:00
Paul Jensen
736432edd2 Merge "Disallow going back to initial empty page in captive portal app" into mnc-dev 2015-06-03 15:17:11 +00:00
Paul Jensen
e836b6847a Disallow going back to initial empty page in captive portal app
This is a little tricky because WebView history can only be cleared
after the next page load and we don't want to allow hitting back
during the first page load.

Bug:21147832
Change-Id: I639dfd27d4dc3af618282256ca02b9947e64a7b9
2015-06-03 15:15:12 +00:00
John Spurlock
75ae23c096 Audio policy: setting explicit non-zero volume unmutes the stream.
And vice versa.

Bug: 21584884
Change-Id: I2cd6a84ab40edba4c6fc2b219693e0d4f0527d8d
2015-06-03 10:50:52 -04:00
John Spurlock
e7f68c18bf Merge "Volume footer uglification." into mnc-dev 2015-06-03 13:24:44 +00:00
Paul Jensen
e247cdec6d Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev 2015-06-03 13:17:58 +00:00
Paul Jensen
65636fb23c Update captive portal sign-in app SSL error page UI.
Add text and update image as per UX team recommendations.
Add "Use as is and open browser" link.

Bug:18791346
Bug:20038019
Bug:20486308
Change-Id: Ibf6d1493f5332e7905154cc7306645ac4c1a6283
2015-06-03 09:12:25 -04:00
Erik Kline
6a5c0e10b1 Delete unsed mDnsLock.
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
2015-06-03 16:10:08 +09:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Lorenzo Colitti
0326f7772c Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev
* changes:
  Remove the IPv4 address from the interface when DHCP fails.
  Make the dumpsys connectivity shorter and easier to read.
2015-06-03 06:03:44 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Jan Nordqvist
d492883529 Cleaned out "isValid" from WifiConfig.
Change-Id: I028615e55700aa92889670297f1130397eba650f
(cherry picked from commit c50315e014efded84b8f1981602951011816360b)
2015-06-03 05:18:12 +00:00
Soonil Nagarkar
597492c963 Add NO_BATCH flag to WifiScanner
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)
2015-06-03 05:17:57 +00:00
Vinit Deshpande
f0742bdf06 Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev
* changes:
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
2015-06-03 05:09:32 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
2015-06-03 04:53:44 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:40 +00:00
Lorenzo Colitti
48f9c731ff Remove the IPv4 address from the interface when DHCP fails.
Bug: 19704592
Change-Id: I9b96cdcfc7c9442b3f8d6797aca63559ed4bdb9b
2015-06-03 12:09:14 +09:00
Lorenzo Colitti
e380546aed Make the dumpsys connectivity shorter and easier to read.
- Print NetworkFactories on one line.
- Only print LegacyTypeTracker networks if they are connected,
  and record supported network types on a separate summary line.
- Print all tethering upstreams on one line.
- Summarize the state of the transition wakelock on one line.
- Don't print Inet condition reports if there are none.
  (Currently there can never be any.)

Bug: 21449922
Change-Id: Ib4b29a7fd882e6c105839a255fffecf4f346cf7e
2015-06-03 11:29:41 +09:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Adrian Roos
21d2a25763 Prevent panel and QS expansion before device is decrypted
Bug: 21514179
Change-Id: Ia36409a2645a00fc2c2630eb39c05d3a0599fd8a
2015-06-03 01:08:21 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Andres Morales
8f589d01d1 Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev 2015-06-03 01:01:18 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07 Merge "Load hyphenation data for more languages." into mnc-dev 2015-06-03 00:56:24 +00:00
Chris Craik
38f4396ebd Merge "Handle shader matrix correctly when ignoring canvas transform" into mnc-dev 2015-06-03 00:27:01 +00:00
Yohei Yukawa
92280cd309 Convert subtypes whose locale is "tl" to "fil".
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".

For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.

In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor.  In this CL, we do replace
"tl" with "fil" by ourselves.

This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.

This CL is based on the investigation by Narayan Kamath and his
patch.

Bug: 20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
2015-06-02 17:09:50 -07:00
Nick Kralevich
2f7fa3ed77 UsbDeviceManager: Don't unnecessarily touch properties
Before setting the properties persist.sys.usb.config or sys.usb.config,
check the existing values. If the values are the same as what we'd set it
to, don't perform the set.

Any USB property set, even if setting the property to the value it already
has, triggers one of the "on property" triggers in system/core/rootdir/init.usb.rc .
The script then reconfigures the driver unnecessarily, which causes instability
and dropped connections when trying to use ADB.

Avoid this instability by not performing property sets which would have
no effect.

Bug: 21404762
Bug: 18905620
Change-Id: Id3c2543308df994a0114a0661e20ca799c2dc0e8
2015-06-02 17:04:47 -07:00
Casper Bonde
da177bb5a0 SAP: Change to use new SDP Api (4/4)
Added class to carry SAP SDP record data.

Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 00:04:37 +00:00
Geoff Mendal
a0d30be3fe Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 00:03:30 +00:00
Geoff Mendal
ec07df075e Import translations. DO NOT MERGE
Change-Id: Iac607a9db94c1949d364ae78a584285bc0882194
Auto-generated-cl: translation import
2015-06-02 17:01:40 -07:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Chris Craik
53e51e4aa9 Handle shader matrix correctly when ignoring canvas transform
bug:20063841

Restores old SkShader matrix behavior from before the Glop refactor.

Many drawing operations draw without sending the canvas transform to
the GL shader. In such cases, we need to adapt the matrix sent to the
SkShader logic to invert the canvas transform that's built into
the mesh.

Change-Id: I42b6f59df36ce46436322b95bf9ad2140795ee58
2015-06-02 16:28:39 -07:00
John Reck
6058251939 Merge "More colors, now with material colors" into mnc-dev 2015-06-02 23:16:31 +00:00
John Reck
4e14da5695 Merge "FrameInfo header fixes" into mnc-dev 2015-06-02 23:16:31 +00:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
John Reck
bf3c602284 More colors, now with material colors
Bug: 18052916
Change-Id: I66c2573d796338ee7b7d0ddf240b90cc78a71ce5
2015-06-02 16:13:56 -07:00
Steve McKay
92dce15787 Update hamburger share, and delete icons to use the 24x MD icons.
BUG=18685222,17699796
Change-Id: I4b14b83eca7fe30e250e1252cb384bc94e05e0a4
(cherry picked from commit e07525536b7edf584ffc96ba69951794d6096b57)
2015-06-02 23:07:40 +00:00
James Cook
d8b7d2ce2d Fix TabHost stealing focus on hardware keyboard keypress
Don't try to change focus at all on exit from touch mode. The old
behavior might have been useful for very old apps with a TabHost as
their primary UI, but that's not a modern app structure.

Bug: 21417491
Change-Id: I3db2ab42c90b6c82f23216244a8183c4290eb7d7
2015-06-02 16:02:12 -07:00
John Reck
4db3d17deb FrameInfo header fixes
Bug: 21560187

Log column names as part of output in case of other such
issues

Change-Id: I16157ed968307e761d416ca54bd7af5453fe67bf
2015-06-02 15:58:43 -07:00
Alan Viverette
d281428abd Update number picker styling for Material
Implements several missing drawable maintenance methods (state, etc.)
for NumberPicker's divider.

Bug: 21588885
Change-Id: Ibe37884354864c43fbf84d9eb79d7183af46fcad
2015-06-02 15:47:37 -07:00
Jason Monk
6ef831fe1a Merge "Tuner: Let Status bar be tuned" into mnc-dev 2015-06-02 22:39:04 +00:00
Santos Cordon
239288cf19 Merge "Fix ringback return value." into mnc-dev 2015-06-02 22:28:45 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2 Merge "Make sure starting windows only draw once" into mnc-dev 2015-06-02 22:24:48 +00:00
Arunesh Mishra
6e4fb34e27 Use config.xml parameters instead of System properties.
For 'near-ultrasound' support (mic/speaker). Refer b/21072209
for details.

Bug: 21072209
Change-Id: Id7131cd38288d74af8102487b2c6b03048b4ae3b
2015-06-02 15:13:17 -07:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Santos Cordon
15d63c718f Fix ringback return value.
Bug: 21474410
Change-Id: I6e08e89636c3b42c97fc194a314a325245755d09
2015-06-02 15:09:38 -07:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00