195839 Commits

Author SHA1 Message Date
Jeff Brown
d63c721e71 Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 2015-06-22 19:29:32 +00:00
John Spurlock
67a0f850a4 Volume: Force focused state to disambig multiple sliders.
And fix volume policy so that a focused slider at the top
of the screen does not cause the window to pan.

Bug: 21476764
Change-Id: I4a52270ca5ecf9b9bd6e787ef580ecbd32e62625
2015-06-22 14:49:27 -04:00
Jason Monk
5658328d8d ButtonBarLayout: Let allowStacking to be set through code
Bug: 21997648
Change-Id: I7ac38d39b4aa282f59b7d13f21d06c7c465ebb20
2015-06-22 14:47:00 -04:00
Sailesh Nepal
20fab81a09 Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev 2015-06-22 18:40:06 +00:00
Dianne Hackborn
5d1462f708 Merge "Fix issue #21930140: Add config to turn off auto power features" into mnc-dev 2015-06-22 18:29:51 +00:00
Shishir Agrawal
c242d9d2ae Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev 2015-06-22 18:19:58 +00:00
David Christie
de4aecd831 Merge "Wait for the capabilities callback before deciding FLP HAL version." into mnc-dev 2015-06-22 18:18:03 +00:00
Makoto Onuki
3a2c3578ba Allow binary value in SettingsProvider
Now a text value will be written to "value" but a binary value will be encoded
in base64 and stored in "valueBase64".

A null value will have neither value nor valueBase64.

Bug 20202004

Change-Id: I1eae936ff38e3460dc76ca20cc38f8d7e5ec6215
2015-06-22 11:16:14 -07:00
Robin Lee
deee7735d8 Let device owners handle onChoosePrivateKey
Bug: 21959745
Change-Id: Ifad3901015937d2ea700124bb5f61982cd580ad8
2015-06-22 11:11:13 -07:00
Yusuke Sato
a77ef4b8b4 Merge "Trace Process.killProcessGroup calls in server/am/" into mnc-dev 2015-06-22 18:08:17 +00:00
Yohei Yukawa
648abe1565 Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 2015-06-22 17:59:42 +00:00
Selim Gurun
7c78112476 Merge "Clarify handling client certificates" into mnc-dev 2015-06-22 17:55:29 +00:00
Geoff Mendal
c424d1f0fa Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 17:42:14 +00:00
Geoff Mendal
0365d4acbc Import translations. DO NOT MERGE
Change-Id: If66d91682adc7a02ebbf87e63b542d91c3d44037
Auto-generated-cl: translation import
2015-06-22 10:30:49 -07:00
Pavlin Radoslavov
b5a479c1f0 Fetch the Bluetooth name and address without enabling the whole stack
After factory reset and first bootup, fetching the Bluetooth device
name and address is now done without explicitly enabling/disabling
the whole Bluetooth stack.
Apparently, enabling/disabling the whole stack during th first bootup
was somehow holding the kernel wakelock without releasing it.

Also, disable debug log messages for class BluetoothManagerService.

Bug: 21949364
Change-Id: Iffc14f7969d05c1456159d1f4246c53fb5df0f7a
2015-06-22 17:10:47 +00:00
Dianne Hackborn
92617036fc Fix issue #21930140: Add config to turn off auto power features
Doze and app standby are now off in the default platform config.
The Google overlay turns them on.  Other people can do that as
well, if they are feeling like it.

Change-Id: Ic8a87f696df94f2d8354fe0772d03b672f464e32
2015-06-22 10:09:45 -07:00
Selim Gurun
a679ac59a1 Clarify handling client certificates
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ida78bd89aa8867c99b4b9e4433e342767e9bac0d
2015-06-22 10:04:01 -07:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Rubin Xu
c54bcade1b Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev 2015-06-22 15:44:51 +00:00
Derek Sollenberger
b2aea9dcbd Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 2015-06-22 15:38:11 +00:00
Jason Monk
616f035bc9 Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev 2015-06-22 14:29:45 +00:00
Jason Monk
c1bc9d4872 Add icon mapping for NETWORK_TYPE_IWLAN
According to TelephonyManager#getNetworkClass, it seems to be a form
of 4g, so give it those icons.

Bug: 21338555
Change-Id: I00629572950191f30fd274367e95c3117990f671
2015-06-22 10:22:55 -04:00
Geoff Mendal
3862452f30 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 14:01:10 +00:00
Geoff Mendal
372a9a2a93 Import translations. DO NOT MERGE
Change-Id: I2ad73428a2295cfc3824de5837ab2f927fd5d626
Auto-generated-cl: translation import
2015-06-22 08:59:17 -05:00
Geoff Mendal
224083b8a1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 13:51:44 +00:00
Geoff Mendal
70b4edff24 Import translations. DO NOT MERGE
Change-Id: Ifd91f44e7bb3ea8577d2054394d4e6b64c488f2b
Auto-generated-cl: translation import
2015-06-22 08:51:18 -05:00
Derek Sollenberger
e109940d81 Enable Picture w/ HW Accelerated Canvas.
Bug: 20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
2015-06-22 13:18:29 +00:00
Andrei Stingaceanu
b1891b3fc9 Fix selection by double tap in Extracted mode
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.

Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
8228e4247c Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 2015-06-22 09:30:20 +00:00
Chris Banes
601bb9921d Fix leak for MenuInflater + setActionBar
Caused when there are multiple calls to
setActionBar(). getMenuInflater() will
instantiate and keep an instance to the first
Toolbar (and it's container, etc).

BUG: 21638877
Change-Id: Ic9e45bf8f810a033c31b7484244f14e08a72b9f4
2015-06-22 10:05:38 +01:00
Vladimir Marko
c28695079e Merge "Don't prevent notification updates in DOS protection." into mnc-dev 2015-06-22 08:53:52 +00:00
Seigo Nonaka
2ac124b790 Revive Null check for backward compatibility.
Bug: 21934529
Change-Id: I18e8f01be728e0400f3218a359b0dc9fd97fbbbd
2015-06-22 16:49:52 +09:00
Jae Seo
37099a082f Merge "TIF: Minor code improvement" into mnc-dev 2015-06-22 01:18:07 +00:00
Jae Seo
777718220c TIF: Use equals() instead of '==' for String comparisons
Change-Id: Iea6e3d5f5146e2e3a37c52db5a0a9706540ddb23
2015-06-21 17:39:02 -07:00
Jae Seo
6e4cbfd2e5 TIF: Minor code improvement
- Removed unnecessary 'final' keywords for private methods
- Removed unnecessary interface modifiers
- Added a missing ‘final’ keyword
- Simplified if statements
- Removed Javadoc links pointing to itself
- Removed redundant conditional expressions
- Removed unnecessary return statements
- Replaced explicit types with <>
- Removed an unnecessary unboxing
- Removed a redundant initializer
- Fixed typos

Change-Id: I1d137fda70192b33dd00e92ab01396519135ab39
2015-06-21 17:09:04 -07:00
Jae Seo
392f2d3b5d Merge "TIF: Use the right size for calls to toArray() instead of 0" into mnc-dev 2015-06-21 23:00:11 +00:00
Jae Seo
a5103b9b52 Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev 2015-06-21 21:27:41 +00:00
Jae Seo
93ff14b7a5 TIF: Use the right size for calls to toArray() instead of 0
Change-Id: I645a09403b60545123627df7d0222ed34f084ffe
2015-06-21 14:21:21 -07:00
Jae Seo
6185858bd9 Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev 2015-06-21 20:48:27 +00:00
Jae Seo
99a242c363 Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev 2015-06-21 20:47:16 +00:00
Jae Seo
5ab0ae0e38 Merge "TIF: Fix a typo" into mnc-dev 2015-06-21 20:46:42 +00:00
Jae Seo
70289a6e8a Merge "TIF: Remove unnecessary interface modifiers" into mnc-dev 2015-06-21 20:46:26 +00:00
Jae Seo
0d4b4a1964 Merge "TIF: Replace StringBuffer with String" into mnc-dev 2015-06-21 20:46:08 +00:00
Sailesh Nepal
000d38ab3c Fix crash when doing conferencing over Wi-Fi
The problem was that we were calling Connection.getAudioState
in the conferencing code. This led to a null pointer exception.

Fix was to add a null pointer check.

BUG: 21957102
Change-Id: Ibad0f6cc70a5bc4a30023beb857125802bc35cd4
2015-06-21 10:25:13 -07:00
John Spurlock
3953b5a1f9 Merge "Zen: Tweak total silence new user message for non-voice devices." into mnc-dev 2015-06-21 14:52:50 +00:00
John Spurlock
cbd7a31a44 Zen: Tweak total silence new user message for non-voice devices.
Bug: 21953388
Change-Id: I395af64b175b22fc58d80529cdbb12ebd9e00115
2015-06-21 10:46:28 -04:00
Jae Seo
40c5c7dcdc TIF: Fix a typo
Change-Id: Iae3b359369a86224767493149b11d83ba2810ec5
2015-06-21 00:47:43 -07:00
Jae Seo
4cd54dda7b TIF: Remove unnecessary interface modifiers
Change-Id: I6b0744b32207bece45bc7ac6bee279b244f8cd3b
2015-06-21 00:45:04 -07:00
Jae Seo
5ea221b989 TIF: Replace StringBuffer with String
Change-Id: I52f7d7cc8af7d230d6a23993391f662542886f37
2015-06-21 00:17:23 -07:00