195918 Commits

Author SHA1 Message Date
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
Jae Seo
1734507286 TIF: Always flush pending app-private commands when resetting TvView
Bug: 19809952
Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
2015-06-20 23:02:29 -07:00
Svet Ganov
3ac465a7d8 Do not thrown on error persisting runtime permissions
bug:20752986

Change-Id: I49d7e30afd49d3dcb1bcffd2fd48e9460ed5147f
2015-06-20 10:31:28 -07:00
Svet Ganov
0f800f7c16 Ensure default permissions not dropped on data wipe
bug:21954760

Change-Id: I15de766012e66e171d2089af574687ad513a5d57
2015-06-20 01:30:44 -07:00
Yohei Yukawa
094c71fd5c Set DISABLED_UNTIL_USED for the correct user in IMMS.
This CL makes If8ff1b2b95c36d33148def2ab87bd006aa520cc0
multi-user aware.

It turns out that DISABLED_UNTIL_USED has not been correctly
set to IMEs seen from secondary users because we have used
  IMMS#mContext.getPackageManager(),
which always returns the PackageManager with the primary
users' context, when specifying
COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED.

We should use IPackageManager instead as we have already done
in many places of IMMS since Ib23849d352db33f0747aa9d5a178f00.

Bug: 8148605
Bug: 8365223
Bug: 21953608
Change-Id: I4b9d6510bf965204bb1f68c8b527d1a4df23fac4
2015-06-20 00:41:31 -07:00
Svet Ganov
d8e247db8c Make READ_EXTERNAL_STORAGE dangerous
We have a new storage permission group that has read and
write external storage. However, read external storage is
(not a regression) a normal permission while write is a
dangerous one. This leads to cases where the user disables
the Storage permission and apps still read form it. This
change makes read external storage a dangerous permission.

bug:21949045

Change-Id: I7e28f629dda6e9c1f70cb20a3d5bea74fb109890
2015-06-19 23:57:52 -07:00
Jae Seo
546ef567b8 TIF: Add COLUMN_SEARCHABLE to TvContract.Programs
This allows applications to specify not only channels but also programs
searchable or not enabling finer grained access control.

Bug: 18910284
Change-Id: Id476c37ae8521301c50a4fb2007b41661e74fe89
2015-06-19 23:47:48 -07:00
Bart Sears
950aa197d4 Merge "Revert "Clarify handling client certificates"" into mnc-dev 2015-06-20 05:22:39 +00:00
Bart Sears
4ead33300f Revert "Clarify handling client certificates"
CL broke the javadoc build.

This reverts commit 36cf701e1ef0e24ce865734babb526ef5e4dc9b4.

Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
2015-06-20 05:21:38 +00:00
Selim Cinek
c99d9a9564 Fixed content description of the lock icon when fingerprint is on
Also surfacing Fingerprint Errors now with a message.

Bug: 21565811
Change-Id: I3bba66303c08313dbca1df5ef2f20b251f541bc1
2015-06-20 03:23:57 +00:00
Paul Jensen
08d9834c1b Merge "Occasionally retest for captive portals once detected" into mnc-dev 2015-06-20 01:16:21 +00:00
Paul Jensen
422f04bc57 Merge "Speed up network transition when WiFi disconnects" into mnc-dev 2015-06-20 01:15:35 +00:00
Paul Jensen
62d308033f Speed up network transition when WiFi disconnects
Before falling back to cellular we used to first delete all the
network routing tables and rules for WiFi.  This isn't necessary
and can take significant time as it requires a lot of netd
shelling out to ip and ip[6]tables to flush routes and remove
the incoming packet mark rule.  Instead have netd delete all the
network routing tables and rules after we've either fallen back
to cellular or at least kicked off a cellular connection attempt.

Bug: 21932815
Change-Id: Iabac4a8b962492682df3073cc41a12e35bc9f1bb
2015-06-20 01:15:20 +00:00
Paul Jensen
2f56a33041 Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 2015-06-20 01:13:18 +00:00
Paul Jensen
8e21d29f7e Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev 2015-06-20 01:12:20 +00:00
Chris Craik
c79df8e831 Clean up drawable filter/dither docs
bug:21342040

Change-Id: I6592bfa504516852967d82a7e7929b1aef6bff02
2015-06-19 18:01:44 -07:00
Adam Powell
b3add4dae2 Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 2015-06-20 00:46:04 +00:00
Jeff Brown
c4bd42c1ee Fix reporting of wakelocks to battery stats.
Fixed certain wake lock types which were being incorrectly reported to
BatteryStats as WAKE_TYPE_FULL due to incomplete decoding of the wake
lock level.

Bug: 21949905
Change-Id: Ie3abfc9f473ce721ad042d228175592c7b8ede33
2015-06-19 17:27:22 -07:00
Jeff Brown
6a8bd7bc13 Repurpose doze wake lock stats for draw wake lock instead.
The doze wake lock is an internal implementation detail with no
power impact.  However the draw wake lock is much more interesting
to track because it's essentially like a special purpose partial
wake lock which may be acquired while dozing.

Bug: 21949905
Change-Id: Iedd5f366eb010a47a9691374c5cd3d85ea68173d
2015-06-19 17:27:21 -07:00
Andreas Gampe
ce49be7ee6 Merge "Frameworks/base: Update preloaded-classes" into mnc-dev 2015-06-20 00:25:40 +00:00
Vinit Deshpande
edb832271b Merge "Fix access point list jumping around in WifiSettings" into mnc-dev 2015-06-20 00:24:33 +00:00
Doris Liu
4a79992591 Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 2015-06-20 00:23:30 +00:00
Simranjit Singh Kohli
0b8a7c00bd [Modify LastAuthenticatedTimestamp behaviour]:
We should not modify lastAuthenticated timestamp in authenticator
specific api's, as some of the calls maybe used by authenticators
for internal maintainance/upgrade. Only modify the timestamp when
calls effecting accounts is made to non-authenticator developer api's.

Bug: 21959561

Change-Id: I7b2d0c875957b263c4d9b203fe1f33042a65a58f
2015-06-19 17:12:38 -07:00
Quddus Chong
bcca4ac4fb am 0bdd3204: am 4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976" into mnc-preview-docs
* commit '0bdd320402aa3406ece0afd1c89bcd00c21b3f7a':
  docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
2015-06-20 00:03:00 +00:00