OSDN Git Service

android-x86/frameworks-base.git
9 years agoFix negative inactiveTime on creating a new user
Amith Yamasani [Fri, 12 Jun 2015 23:35:17 +0000 (16:35 -0700)]
Fix negative inactiveTime on creating a new user

Initialize the beginIdleTime to 0 rather than current time.

Bug: 21699099
Change-Id: Ib94a9198c4e80aea5d9de68c5cf5d6f8cfc79e0a

9 years agoMerge "Update network state of apps leaving the whitelist" into mnc-dev
Amith Yamasani [Fri, 12 Jun 2015 20:26:41 +0000 (20:26 +0000)]
Merge "Update network state of apps leaving the whitelist" into mnc-dev

9 years agoUpdate network state of apps leaving the whitelist
Amith Yamasani [Fri, 12 Jun 2015 20:23:33 +0000 (13:23 -0700)]
Update network state of apps leaving the whitelist

Bug: 21787562
Change-Id: I9f45acc58ba0b4b6cfed08aecbf081a5f57eb217

9 years agoMerge "If we're out of space, retry background dexopting later" into mnc-dev
Christopher Tate [Fri, 12 Jun 2015 20:23:27 +0000 (20:23 +0000)]
Merge "If we're out of space, retry background dexopting later" into mnc-dev

9 years agoIf we're out of space, retry background dexopting later
Christopher Tate [Fri, 12 Jun 2015 20:06:45 +0000 (13:06 -0700)]
If we're out of space, retry background dexopting later

Give it 4 hours to give the user time to do stuff, then retry;
repeat until we have space to work in.

Bug 20468442

Change-Id: Id4b11abcc38a9e2a50a062f0067a13ce0ae831ad

9 years agoMerge "Fix Android Keystore KeyPairGenerator for RSA PSS keys." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 19:54:18 +0000 (19:54 +0000)]
Merge "Fix Android Keystore KeyPairGenerator for RSA PSS keys." into mnc-dev

9 years agoMerge "Update Javadocs to reflect meaning of digest and padding NONE." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 19:54:06 +0000 (19:54 +0000)]
Merge "Update Javadocs to reflect meaning of digest and padding NONE." into mnc-dev

9 years agoMerge "Obtain entropy later in crypto operations, when possible." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 19:53:43 +0000 (19:53 +0000)]
Merge "Obtain entropy later in crypto operations, when possible." into mnc-dev

9 years agoMerge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
Dianne Hackborn [Fri, 12 Jun 2015 19:38:38 +0000 (19:38 +0000)]
Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev

9 years agoImplement some control over ALLOW_WHILE_IDLE alarms.
Dianne Hackborn [Wed, 10 Jun 2015 23:25:57 +0000 (16:25 -0700)]
Implement some control over ALLOW_WHILE_IDLE alarms.

Since these alarms allow you to bypass the idle restrictions,
we don't want them to be so open-ended like other alarms.  This
implements a policy where the alarm manager will only deliver these
types of alarms every X minutes to each application.  For this
initial implementation, X is 1 minute under normal operation and
15 minutes when in idle mode.

To do this, I needed to introduce a new internal allow-while-idle
flag for system alarms, which applications can't get, and doesn't
have these new restrictions.

Also tweaked how the alarm manager handles the alarm window, so it
doesn't change if the alarm gets rescheduld; the window is now always
what as computed based on the time when the alarm was first
given to it.

Finally, fix TimeUtils to be able to correctly print times that
are > 999 days.

Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84

9 years agoMerge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
Chris Wren [Fri, 12 Jun 2015 19:28:52 +0000 (19:28 +0000)]
Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev

9 years agoFix Android Keystore KeyPairGenerator for RSA PSS keys.
Alex Klyubin [Fri, 12 Jun 2015 19:16:45 +0000 (12:16 -0700)]
Fix Android Keystore KeyPairGenerator for RSA PSS keys.

This fixes a bug where key pair generation fails for RSA signing keys
which are not authorized for PKCS#1 signature padding, such as keys
authorized only for the RSA PSS signature padding scheme.

The issue was that the KeyPairGenerator was failing when attempting to
sign the self-signed certificate (needed by Android Keystore) using
PKCS#1 padding for which such keys are not authorized. The solution is
to not attempt to sign these certificates and instead use a fake
signature.

Bug: 21809600
Change-Id: I4f04fcf78174937046d2534e0485c6940eae673f

9 years agoMerge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
Rubin Xu [Fri, 12 Jun 2015 18:27:43 +0000 (18:27 +0000)]
Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev

9 years agoMerge "Revert to save-layer based alpha if layer would be too large" into mnc-dev
Chris Craik [Fri, 12 Jun 2015 18:16:51 +0000 (18:16 +0000)]
Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev

9 years agoRevert to save-layer based alpha if layer would be too large
Chris Craik [Fri, 12 Jun 2015 18:07:23 +0000 (11:07 -0700)]
Revert to save-layer based alpha if layer would be too large

bug:21011574
Change-Id: I323f2398188ffc2bbed6a98578d25d7e5f6c337d

9 years agoMerge "Fix typo in Call.Details.propertiesToString" into mnc-dev
Yorke Lee [Fri, 12 Jun 2015 17:53:39 +0000 (17:53 +0000)]
Merge "Fix typo in Call.Details.propertiesToString" into mnc-dev

9 years agoMerge "Report app standby state to batterystats" into mnc-dev
Amith Yamasani [Fri, 12 Jun 2015 17:52:54 +0000 (17:52 +0000)]
Merge "Report app standby state to batterystats" into mnc-dev

9 years agoObtain entropy later in crypto operations, when possible.
Alex Klyubin [Fri, 12 Jun 2015 17:00:36 +0000 (10:00 -0700)]
Obtain entropy later in crypto operations, when possible.

This makes Android Keystore crypto operations defer pulling entropy
from provided SecureRandom until KeyStore.finish, where appropriate.
Such as when performing asymmetric encryption or generating
signatures.

Bug: 18088752
Change-Id: I4a897754e9a846214cf0995c5514f98cf0edd76b

9 years agoMerge "Fixes for API Review: android.speech.tts" into mnc-dev
Przemyslaw Szczepaniak [Fri, 12 Jun 2015 17:34:11 +0000 (17:34 +0000)]
Merge "Fixes for API Review: android.speech.tts" into mnc-dev

9 years agoFixes for API Review: android.speech.tts
Przemyslaw Szczepaniak [Fri, 12 Jun 2015 16:07:03 +0000 (17:07 +0100)]
Fixes for API Review: android.speech.tts

Bug: 21571893
Change-Id: Icd25f4aa9a465050c7410c7bfec004a71ba24548

9 years agoMerge "Stops BLE scan when scan only mode is disabled." into mnc-dev
Wei Wang [Fri, 12 Jun 2015 17:20:32 +0000 (17:20 +0000)]
Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev

9 years agoFix typo in Call.Details.propertiesToString
Yorke Lee [Fri, 12 Jun 2015 17:10:55 +0000 (10:10 -0700)]
Fix typo in Call.Details.propertiesToString

Change-Id: I7bb52138912fddef20862f5f7a29a8ec2e0a1d66

9 years agoMerge "Annotate ContentProviderClient arguments." into mnc-dev
Jeff Sharkey [Fri, 12 Jun 2015 16:57:54 +0000 (16:57 +0000)]
Merge "Annotate ContentProviderClient arguments." into mnc-dev

9 years agoAnnotate ContentProviderClient arguments.
Jeff Sharkey [Fri, 12 Jun 2015 16:49:31 +0000 (09:49 -0700)]
Annotate ContentProviderClient arguments.

Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0

9 years agoMerge "Fix APIs." into mnc-dev
Dianne Hackborn [Fri, 12 Jun 2015 16:34:36 +0000 (16:34 +0000)]
Merge "Fix APIs." into mnc-dev

9 years agoMerge "Clarify Drawable.getOpacity() docs" into mnc-dev
Chet Haase [Fri, 12 Jun 2015 16:24:29 +0000 (16:24 +0000)]
Merge "Clarify Drawable.getOpacity() docs" into mnc-dev

9 years agoClarify Drawable.getOpacity() docs
Chet Haase [Fri, 12 Jun 2015 09:27:44 +0000 (10:27 +0100)]
Clarify Drawable.getOpacity() docs

Docs for translucent-vs-transparent-vs-opaque were confusing, especially since
the definition for those constants in PixelFormat are not the same as how they're
actually used in Drawable. This fix simply adds clarifying text to the method
comment for getOpacity().

Issue #21158891  Better document Drawable#getOpacity

Change-Id: I94725592f85e5d7874e3a3ac1c5bab969163fbf0

9 years agoReport app standby state to batterystats
Amith Yamasani [Tue, 9 Jun 2015 19:23:58 +0000 (12:23 -0700)]
Report app standby state to batterystats

Also reduce idle checks to the target user if possible.
Optimized calls to some internal methods

Bug: 21639147
Change-Id: If1faf26f862e5c4ca905f2603a4ba52a8d1af954

9 years agoMerge "Document that DownloadManager supports HTTPS." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 16:02:15 +0000 (16:02 +0000)]
Merge "Document that DownloadManager supports HTTPS." into mnc-dev

9 years agoMerge "Remove View.getBackgroundColor()" into mnc-dev
Chet Haase [Fri, 12 Jun 2015 14:50:17 +0000 (14:50 +0000)]
Merge "Remove View.getBackgroundColor()" into mnc-dev

9 years agoUpdate doc of ACTION_PROVISION_MANAGED_DEVICE
Rubin Xu [Fri, 12 Jun 2015 12:27:59 +0000 (13:27 +0100)]
Update doc of ACTION_PROVISION_MANAGED_DEVICE

It also supports an optional extra EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE

Bug: 21797182
Change-Id: Ie145e6a79dd7eebdbb4cc58e1baba761b9cc5bbf

9 years agoremove usage of deprecated method setLatestEventInfo
Chris Wren [Thu, 11 Jun 2015 14:19:43 +0000 (10:19 -0400)]
remove usage of deprecated method setLatestEventInfo

Bug: 18510449
Change-Id: I56a77991c729990e501f402e007dfa79ee57621e

9 years agoMerge "SysUI: Status bar ImageViews" into mnc-dev
Andrew Flynn [Fri, 12 Jun 2015 13:58:10 +0000 (13:58 +0000)]
Merge "SysUI: Status bar ImageViews" into mnc-dev

9 years agoSysUI: Status bar ImageViews
Andrew Flynn [Wed, 10 Jun 2015 18:12:23 +0000 (14:12 -0400)]
SysUI: Status bar ImageViews

- Switch AlphaOptimizedImageView to have the boolean hasOverLappingRendering()
  return be a custom value. This allows us to have AnimatedImageView extend
  AlphaOptimizedImageView and support both types of ImageViews w/o having to
  create 2x subclasses.
- Add drawable ID tracking to AnimatedImageView so that we don't interrupt
  animations with an update of the exact same drawable.
- Switch mobile signal icon to use AnimatedImageView so that animations aren't
  interrupted.

Bug: 21504588
Change-Id: Ic2275f1bf607449c191ae0d08bc7756c7d694bc1

9 years agoRemove View.getBackgroundColor()
Chet Haase [Fri, 12 Jun 2015 12:25:27 +0000 (13:25 +0100)]
Remove View.getBackgroundColor()

This method was added earlier in M - removing it now based on API
Council feedback.

Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: I04fad49c3c377218d0fb708dbeaea609aca46ce8

9 years agoFloating toolbar old theme fix
Andrei Stingaceanu [Fri, 5 Jun 2015 15:36:37 +0000 (16:36 +0100)]
Floating toolbar old theme fix

The floating toolbar now has it's own theming:
* material_light used for all light themes
* material_dark for dark themes

The attributes are not public.

Bug: 21177954
Change-Id: I7ccf9c677be44d510ab48168c0215d37456be059

9 years agoMerge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev
Keisuke Kuroyanagi [Fri, 12 Jun 2015 11:10:17 +0000 (11:10 +0000)]
Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev

9 years agoMerge "Notification shown upon work profile deletion" into mnc-dev
Alex Chau [Fri, 12 Jun 2015 10:14:26 +0000 (10:14 +0000)]
Merge "Notification shown upon work profile deletion" into mnc-dev

9 years agoChange references to APK Certificate to Signature
Rubin Xu [Tue, 2 Jun 2015 08:29:46 +0000 (09:29 +0100)]
Change references to APK Certificate to Signature

The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed

9 years agoMerge "Revert write secure settings permission protection level." into mnc-dev
Svet Ganov [Fri, 12 Jun 2015 07:30:31 +0000 (07:30 +0000)]
Merge "Revert write secure settings permission protection level." into mnc-dev

9 years agoRevert write secure settings permission protection level.
Svet Ganov [Fri, 12 Jun 2015 07:28:39 +0000 (00:28 -0700)]
Revert write secure settings permission protection level.

bug:21619456

Change-Id: I31212d3677b74fbf26b2d9eb222a2a8132de2271

9 years agoMerge "Sigh, some apps are sending null ContentValues." into mnc-dev
Jeff Sharkey [Fri, 12 Jun 2015 04:57:06 +0000 (04:57 +0000)]
Merge "Sigh, some apps are sending null ContentValues." into mnc-dev

9 years agoSigh, some apps are sending null ContentValues.
Jeff Sharkey [Fri, 12 Jun 2015 04:55:32 +0000 (21:55 -0700)]
Sigh, some apps are sending null ContentValues.

Bug: 21560515
Change-Id: Id5a62611781a2d9da47ad3e522d3d43f860b1f70

9 years agoMerge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev
Yohei Yukawa [Fri, 12 Jun 2015 04:53:05 +0000 (04:53 +0000)]
Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev

9 years agoMerge "Support AppBar from Material Design." into mnc-dev
Jens Ole Lauridsen [Fri, 12 Jun 2015 04:48:48 +0000 (04:48 +0000)]
Merge "Support AppBar from Material Design." into mnc-dev

9 years agoMerge "Annotate ContentResolver/Provider arguments." into mnc-dev
Jeff Sharkey [Fri, 12 Jun 2015 04:46:13 +0000 (04:46 +0000)]
Merge "Annotate ContentResolver/Provider arguments." into mnc-dev

9 years agoAnnotate ContentResolver/Provider arguments.
Jeff Sharkey [Fri, 12 Jun 2015 02:30:57 +0000 (19:30 -0700)]
Annotate ContentResolver/Provider arguments.

Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: I5f671c241dfe65e5ab8bc06b2382fbf5a82bdb20

9 years agoFix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
Yohei Yukawa [Fri, 12 Jun 2015 04:42:49 +0000 (21:42 -0700)]
Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.

Fix confirmed with 'make doc-comment-check-docs'

Bug: 21446448
Change-Id: Ica4359b13ddbc790740cc22c95b9e002f7c8e4b8

9 years agoMerge "Read MMS config from CarrierConfigManager." into mnc-dev
Jonathan Basseri [Fri, 12 Jun 2015 04:41:36 +0000 (04:41 +0000)]
Merge "Read MMS config from CarrierConfigManager." into mnc-dev

9 years agoLower protection level of WiFi state change permissions.
Svet Ganov [Fri, 12 Jun 2015 03:04:04 +0000 (20:04 -0700)]
Lower protection level of WiFi state change permissions.

bug:21724236

Change-Id: Ib2305bf8a6be62fe6b00d9bccc7685100edba9ba

9 years agoRevert accidentally deleted strings
Svetoslav Ganov [Fri, 12 Jun 2015 02:39:34 +0000 (02:39 +0000)]
Revert accidentally deleted strings

Change-Id: I5d900c7a7f035b286bcaf044f871f781b3427568

9 years agoMerge "Valid filenames have length limits!" into mnc-dev
Jeff Sharkey [Fri, 12 Jun 2015 02:18:27 +0000 (02:18 +0000)]
Merge "Valid filenames have length limits!" into mnc-dev

9 years agoValid filenames have length limits!
Jeff Sharkey [Fri, 12 Jun 2015 02:13:37 +0000 (19:13 -0700)]
Valid filenames have length limits!

ext4 filenames are at most 255 bytes.  vfat filenames are bit more
lax, but we're often saving them on ext4 through a FUSE daemon, so
limit them the same way.

Since package names are used as directory names, verify that they're
valid filenames.

Tests to verify behavior.

Bug: 18689171
Change-Id: If7df4c40d352954510b71de4ff05d78259c721ed

9 years agoam 03a216f1: am ef8c2834: Merge "Doc change: miscellaneous tag optimizations and...
Dirk Dougherty [Fri, 12 Jun 2015 02:05:14 +0000 (02:05 +0000)]
am 03a216f1: am ef8c2834: Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs

* commit '03a216f19f8cba8d9e1d7e7f2042addd259e19d2':
  Doc change: miscellaneous tag optimizations and edits.

9 years agoMerge "Configure auto-rotation tilt tolerance in config.xml." into mnc-dev
Jeff Brown [Fri, 12 Jun 2015 01:59:11 +0000 (01:59 +0000)]
Merge "Configure auto-rotation tilt tolerance in config.xml." into mnc-dev

9 years agoConfigure auto-rotation tilt tolerance in config.xml.
Jeff Brown [Thu, 11 Jun 2015 05:12:54 +0000 (22:12 -0700)]
Configure auto-rotation tilt tolerance in config.xml.

This allows for the thresholds to be tuned differently for different
products as needed.

Bug: 18276856
Change-Id: I6c87e683dea6a17cf606203a894c8419e20d3658

9 years agoam ef8c2834: Merge "Doc change: miscellaneous tag optimizations and edits." into...
Dirk Dougherty [Fri, 12 Jun 2015 01:45:36 +0000 (01:45 +0000)]
am ef8c2834: Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs

* commit 'ef8c2834f19c404cad025a4b583525b62a4b2790':
  Doc change: miscellaneous tag optimizations and edits.

9 years agoMerge "Add new storage permission group" into mnc-dev
Svet Ganov [Fri, 12 Jun 2015 01:40:11 +0000 (01:40 +0000)]
Merge "Add new storage permission group" into mnc-dev

9 years agoMerge "Make VIMS.SettingsObserver multiuser-aware." into mnc-dev
Yohei Yukawa [Fri, 12 Jun 2015 01:39:07 +0000 (01:39 +0000)]
Merge "Make VIMS.SettingsObserver multiuser-aware." into mnc-dev

9 years agoMerge "Update SMS permission group description." into mnc-dev
Svetoslav [Fri, 12 Jun 2015 01:38:27 +0000 (01:38 +0000)]
Merge "Update SMS permission group description." into mnc-dev

9 years agoAccessibility improvements
Adrian Roos [Fri, 12 Jun 2015 01:22:52 +0000 (18:22 -0700)]
Accessibility improvements

- label the "no sims" icon
- label the "managed profile" icon

Bug: 21165217
Change-Id: I3e809d1a857eea12b613f09ae5265e785d372ec3

9 years agoMerge "Bump up the protection level of the CLEAR_APP_CACHE permission" into mnc-dev
Svet Ganov [Fri, 12 Jun 2015 01:36:47 +0000 (01:36 +0000)]
Merge "Bump up the protection level of the CLEAR_APP_CACHE permission" into mnc-dev

9 years agoMerge changes Ic643bc07,I4bef927b into mnc-dev
Svet Ganov [Fri, 12 Jun 2015 01:36:25 +0000 (01:36 +0000)]
Merge changes Ic643bc07,I4bef927b into mnc-dev

* changes:
  Lower protection level of the dangerous Bluetooth permissions
  Update sensors permission group name string

9 years agoMerge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs
Dirk Dougherty [Fri, 12 Jun 2015 01:34:37 +0000 (01:34 +0000)]
Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs

9 years agoBump up the protection level of the CLEAR_APP_CACHE permission
Svet Ganov [Fri, 12 Jun 2015 01:34:28 +0000 (18:34 -0700)]
Bump up the protection level of the CLEAR_APP_CACHE permission

This permission guards only hidden and system APIs, hance it
should be signatureOrSystem protection level.

Change-Id: I8d2b75167c6887a285af0b494c39b4ffea2f0cbf

9 years agoDoc change: miscellaneous tag optimizations and edits.
Dirk Dougherty [Thu, 11 Jun 2015 18:53:40 +0000 (11:53 -0700)]
Doc change: miscellaneous tag optimizations and edits.

Change-Id: I9da06cdf950894b32eedb0b63b5b7a9eb2d52003

9 years agoDO NOT MERGE Remove RemoteInput from SystemUI
Adrian Roos [Wed, 10 Jun 2015 22:49:11 +0000 (15:49 -0700)]
DO NOT MERGE Remove RemoteInput from SystemUI

Bug: 21570986
Change-Id: I80987b3ac333a97426648c3b363420d502a19866

9 years agoLower protection level of the dangerous Bluetooth permissions
Svet Ganov [Fri, 12 Jun 2015 01:24:26 +0000 (18:24 -0700)]
Lower protection level of the dangerous Bluetooth permissions

bug:21594947

Change-Id: Ic643bc0768b0fc9adcc3e07661ee34fa59f4ec35

9 years agoFix APIs.
Dianne Hackborn [Thu, 11 Jun 2015 20:29:01 +0000 (13:29 -0700)]
Fix APIs.

Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist

Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.

Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92

9 years agoUpdate Javadocs to reflect meaning of digest and padding NONE.
Alex Klyubin [Thu, 11 Jun 2015 21:44:46 +0000 (14:44 -0700)]
Update Javadocs to reflect meaning of digest and padding NONE.

This also adds information about what digests and paddings may need to
be specified for keys used in TLS/SSL for client or server
authentication.

Bug: 21777596
Change-Id: Icd495458c38c4f912b21a64ca7aab2c88d76461c

9 years agoStops BLE scan when scan only mode is disabled.
Wei Wang [Fri, 12 Jun 2015 00:50:29 +0000 (17:50 -0700)]
Stops BLE scan when scan only mode is disabled.

Bug: 21791070
Change-Id: I1137190f01fb3790b7dfbc409429414da44abe58

9 years agoMerge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into...
Adam Powell [Fri, 12 Jun 2015 00:45:21 +0000 (00:45 +0000)]
Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev

9 years agoMerge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev
Yohei Yukawa [Fri, 12 Jun 2015 00:39:28 +0000 (00:39 +0000)]
Merge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev

9 years agoMerge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev
Yohei Yukawa [Fri, 12 Jun 2015 00:38:20 +0000 (00:38 +0000)]
Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev

9 years agoMerge "Make WindowManagerService.SettingsObserver multiuser-aware." into mnc-dev
Yohei Yukawa [Fri, 12 Jun 2015 00:34:37 +0000 (00:34 +0000)]
Merge "Make WindowManagerService.SettingsObserver multiuser-aware." into mnc-dev

9 years agoMerge "Update Javadocs: all new features supported for asymmetric crypto." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Update Javadocs: all new features supported for asymmetric crypto." into mnc-dev

9 years agoMerge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev
Ruben Brunk [Fri, 12 Jun 2015 00:25:46 +0000 (00:25 +0000)]
Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev

9 years agoMerge "Do not require USE_FINGERPRINT for getAuthenticatorId." into mnc-dev
Alex Klyubin [Fri, 12 Jun 2015 00:25:29 +0000 (00:25 +0000)]
Merge "Do not require USE_FINGERPRINT for getAuthenticatorId." into mnc-dev

9 years agofix ArrayIndexOutOfBoundsException while starting WifiScannerScan
Navtej Singh Mann [Thu, 11 Jun 2015 23:53:11 +0000 (16:53 -0700)]
fix ArrayIndexOutOfBoundsException while starting WifiScannerScan

bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4

9 years agoMerge "Make MediaRouteControllerDialog scrollable" into mnc-dev
Sungsoo Lim [Thu, 11 Jun 2015 23:52:01 +0000 (23:52 +0000)]
Merge "Make MediaRouteControllerDialog scrollable" into mnc-dev

9 years agoam 6e56db8b: am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview...
Rich Slogar [Thu, 11 Jun 2015 23:36:25 +0000 (23:36 +0000)]
am 6e56db8b: am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs

* commit '6e56db8b7b12799428bcdbd06728170600c09286':
  docs: sdk tools 24.3.2 updates

9 years agoam e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs
Rich Slogar [Thu, 11 Jun 2015 23:25:13 +0000 (23:25 +0000)]
am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs

* commit 'e9dd30b27687ecc0e152f73eec05399af1c04bb3':
  docs: sdk tools 24.3.2 updates

9 years agoam fb91c81f: am 2f414b76: Merge "Removing traces out outdated GCM training class...
Eric Gilmore [Thu, 11 Jun 2015 23:23:44 +0000 (23:23 +0000)]
am fb91c81f: am 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs

* commit 'fb91c81fc583c2ad5ad895c7bf87675827a4af31':
  Removing traces out outdated GCM training class.

9 years agoMerge "Add ArraySet to the SDK." into mnc-dev
Dianne Hackborn [Thu, 11 Jun 2015 23:14:27 +0000 (23:14 +0000)]
Merge "Add ArraySet to the SDK." into mnc-dev

9 years agoMake CameraDeviceImpl#close() idempotent (for real).
Ruben Brunk [Thu, 11 Jun 2015 23:12:35 +0000 (16:12 -0700)]
Make CameraDeviceImpl#close() idempotent (for real).

- Also fixes onClosed() implementation in CameraDeviceImpl;
  this would never return true previously.

Bug: 21698939
Change-Id: I4dd56a1410b9fc64152acc5296514f5841794fa9

9 years agoam 480d6e8e: am e4e40c03: docs: remove obsolete FAQ pages
Joe Fernandez [Thu, 11 Jun 2015 23:11:28 +0000 (23:11 +0000)]
am 480d6e8e: am e4e40c03: docs: remove obsolete FAQ pages

* commit '480d6e8e08c2d5ae6cd4ce51ef02948202621a17':
  docs: remove obsolete FAQ pages

9 years agoMerge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs
Rich Slogar [Thu, 11 Jun 2015 23:09:26 +0000 (23:09 +0000)]
Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs

9 years agoam 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-previe...
Eric Gilmore [Thu, 11 Jun 2015 23:08:56 +0000 (23:08 +0000)]
am 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs

* commit '2f414b7612e095c383fb4052c671634d82940654':
  Removing traces out outdated GCM training class.

9 years agoUpdate sensors permission group name string
Svet Ganov [Thu, 11 Jun 2015 22:58:34 +0000 (15:58 -0700)]
Update sensors permission group name string

bug:21784262

Change-Id: I4bef927b7e9de246df8d5ab6cfe7d40f78942fe7

9 years agoMerge "Removing traces out outdated GCM training class." into mnc-preview-docs
Eric Gilmore [Thu, 11 Jun 2015 22:58:31 +0000 (22:58 +0000)]
Merge "Removing traces out outdated GCM training class." into mnc-preview-docs

9 years agoam e4e40c03: docs: remove obsolete FAQ pages
Joe Fernandez [Thu, 11 Jun 2015 22:56:20 +0000 (22:56 +0000)]
am e4e40c03: docs: remove obsolete FAQ pages

* commit 'e4e40c0347e76ea4afaf7d442c4daeb9f08b2d91':
  docs: remove obsolete FAQ pages

9 years agodocs: sdk tools 24.3.2 updates
Rich Slogar [Thu, 11 Jun 2015 20:56:37 +0000 (13:56 -0700)]
docs: sdk tools 24.3.2 updates

Change-Id: I3eb7b789985653614361505eea3aa0040ef5ea52

9 years agoMerge "Improve boundary check for for Paint#DrawTextRun." into mnc-dev
Keisuke Kuroyanagi [Thu, 11 Jun 2015 22:44:52 +0000 (22:44 +0000)]
Merge "Improve boundary check for for Paint#DrawTextRun." into mnc-dev

9 years agodocs: remove obsolete FAQ pages
Joe Fernandez [Thu, 11 Jun 2015 22:30:42 +0000 (15:30 -0700)]
docs: remove obsolete FAQ pages

These pages have not been maintained and have not been included in the
DAC navigation structure for some time.

b/19413080

redirects change: If512bdf55b16f0faf21de7db81ab26d59489da15

Change-Id: Ibc1aa5c691edb938cbb7d4b2d885f1ea8a5f6ef4

9 years agoMerge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev
Fyodor Kupolov [Thu, 11 Jun 2015 22:29:20 +0000 (22:29 +0000)]
Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev

9 years agoFixed NPE when dumpSettings is called with a null cursor
Fyodor Kupolov [Thu, 11 Jun 2015 22:25:59 +0000 (15:25 -0700)]
Fixed NPE when dumpSettings is called with a null cursor

Bug: 20070414
Change-Id: I15d5d2ae27a7892807221421778082e0f29a36ff

9 years agoMerge "Set scaling mode for legacy device surfaces." into mnc-dev
Ruben Brunk [Thu, 11 Jun 2015 22:15:56 +0000 (22:15 +0000)]
Merge "Set scaling mode for legacy device surfaces." into mnc-dev

9 years agoSet scaling mode for legacy device surfaces.
Ruben Brunk [Wed, 10 Jun 2015 23:44:28 +0000 (16:44 -0700)]
Set scaling mode for legacy device surfaces.

Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218

9 years agoMerge "Revert "Enabled WMS.DEBUG_STARTING_WINDOW"" into mnc-dev
Wale Ogunwale [Thu, 11 Jun 2015 22:12:20 +0000 (22:12 +0000)]
Merge "Revert "Enabled WMS.DEBUG_STARTING_WINDOW"" into mnc-dev

9 years agoMerge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev
Adam Lesinski [Thu, 11 Jun 2015 22:02:36 +0000 (22:02 +0000)]
Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev