OSDN Git Service

android-x86/frameworks-base.git
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 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 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

9 years agoUsageStats: Change INTERACTION to SYSTEM_INTERACTION
Adam Lesinski [Wed, 10 Jun 2015 22:33:45 +0000 (15:33 -0700)]
UsageStats: Change INTERACTION to SYSTEM_INTERACTION

SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183

9 years agoMerge "Make apk entry separator compliant with jar url format" into mnc-dev
Dimitry Ivanov [Thu, 11 Jun 2015 21:54:53 +0000 (21:54 +0000)]
Merge "Make apk entry separator compliant with jar url format" into mnc-dev

9 years agoMerge "Add path to native libraries inside apk" into mnc-dev
Dmitriy Ivanov [Thu, 11 Jun 2015 21:54:53 +0000 (21:54 +0000)]
Merge "Add path to native libraries inside apk" into mnc-dev

9 years agoMerge "Prevent system uid component from running in an app process" into mnc-dev
Wale Ogunwale [Thu, 11 Jun 2015 21:48:53 +0000 (21:48 +0000)]
Merge "Prevent system uid component from running in an app process" into mnc-dev

9 years agoFix accessibility bounds
Adrian Roos [Thu, 11 Jun 2015 19:19:16 +0000 (12:19 -0700)]
Fix accessibility bounds

Follow up to Ifcc5bd7258c00ebd3a64ca4a4edd894e3baf0ccc
Bug: 21763049

Change-Id: I3026b22848ef1552e2faa82d9e0f4409d2cba63a

9 years agoUpdate Javadocs: all new features supported for asymmetric crypto.
Alex Klyubin [Thu, 11 Jun 2015 21:48:06 +0000 (14:48 -0700)]
Update Javadocs: all new features supported for asymmetric crypto.

Bug: 20912868
Change-Id: I633d3caa3f40dd0b038b2f7e75825614bed2c0f5

9 years agoMerge "Fix build." into mnc-dev
Dianne Hackborn [Thu, 11 Jun 2015 21:32:22 +0000 (21:32 +0000)]
Merge "Fix build." into mnc-dev

9 years agoFix build.
Dianne Hackborn [Thu, 11 Jun 2015 21:28:07 +0000 (14:28 -0700)]
Fix build.

Change-Id: I3da590a03e1c7ff0862f69bbb4967687970a98e1

9 years agoMerge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev
Carlos Valdivia [Thu, 11 Jun 2015 21:18:01 +0000 (21:18 +0000)]
Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev

9 years agoRevert "Revert "Permissions: Fix account related permissions.""
Carlos Valdivia [Thu, 11 Jun 2015 20:07:11 +0000 (13:07 -0700)]
Revert "Revert "Permissions: Fix account related permissions.""

This reverts commit dcddc476651deb72a27798de56eef584e5be5d32.

Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe

9 years agoAdd ArraySet to the SDK.
Dianne Hackborn [Thu, 11 Jun 2015 00:49:43 +0000 (17:49 -0700)]
Add ArraySet to the SDK.

Also fix some documentation.

Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d

9 years agoMerge "Fix CarrierText airplane mode with no sims" into mnc-dev
Jason Monk [Thu, 11 Jun 2015 20:47:47 +0000 (20:47 +0000)]
Merge "Fix CarrierText airplane mode with no sims" into mnc-dev

9 years agoDo not require USE_FINGERPRINT for getAuthenticatorId.
Alex Klyubin [Thu, 11 Jun 2015 20:27:34 +0000 (13:27 -0700)]
Do not require USE_FINGERPRINT for getAuthenticatorId.

This removes the requirement to hold the USE_FINGERPRINT permission
to successfully invoke FingerprintManager.getAuthenticatorId().

This is needed because Android Keystore classes which run inside app
processes occasionally need to access this authenticator ID. The
access however is not necessarily triggered by the developer using
APIs to do with fingerprints. Thus, if an app does not hold the
USE_FINGERPRINT permission and uses Android Keystore API, it may
unexpectedly encounter a SecurityException.

It's OK to provide access to authenticator ID without requiring
USE_FINGERPRINT permission because there are other ways to access
this ID without holding that permission, such as though hidden
KeyStore API.

Once Android Keystore code is restructured to no longer require
access to authenticator ID, this CL can be reverted.

Bug: 21030147
Change-Id: I9af29830abce34c46e29e5c1682cc3ab88c95c00

9 years agoMerge "A11y: Use a backstop dialog timeout when a11y is enabled." into mnc-dev
John Spurlock [Thu, 11 Jun 2015 20:35:51 +0000 (20:35 +0000)]
Merge "A11y: Use a backstop dialog timeout when a11y is enabled." into mnc-dev

9 years agoMerge "Fix intermediate preview size selection for legacy." into mnc-dev
Ruben Brunk [Thu, 11 Jun 2015 20:29:25 +0000 (20:29 +0000)]
Merge "Fix intermediate preview size selection for legacy." into mnc-dev

9 years agoMerge "Camera2: Legacy: handle FPS range properly" into mnc-dev
Yin-Chia Yeh [Thu, 11 Jun 2015 20:29:00 +0000 (20:29 +0000)]
Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev

9 years agoMerge "Workaround shader crash" into mnc-dev
Chris Craik [Thu, 11 Jun 2015 20:28:39 +0000 (20:28 +0000)]
Merge "Workaround shader crash" into mnc-dev

9 years agoMerge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
Amit Mahajan [Thu, 11 Jun 2015 20:26:14 +0000 (20:26 +0000)]
Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev

9 years agoMerge "Revert contact metadata_sync constants." into mnc-dev
Zheng Fu [Thu, 11 Jun 2015 20:24:58 +0000 (20:24 +0000)]
Merge "Revert contact metadata_sync constants." into mnc-dev

9 years agoMerge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants...
Adam Lesinski [Thu, 11 Jun 2015 20:24:29 +0000 (20:24 +0000)]
Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev

9 years agoMerge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev
Roozbeh Pournader [Thu, 11 Jun 2015 20:19:28 +0000 (20:19 +0000)]
Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev

9 years agoA11y: Use a backstop dialog timeout when a11y is enabled.
John Spurlock [Thu, 11 Jun 2015 20:14:44 +0000 (16:14 -0400)]
A11y: Use a backstop dialog timeout when a11y is enabled.

 - Or more precisely, whenever a non-generic-only a11y service
   is enabled.

Bug: 21360311
Change-Id: I9e65b7f690d5b670b2d8e944b7d87e0fd1bce327

9 years agoMerge EXTENDED font profile with the next (unnamed) profile.
Roozbeh Pournader [Thu, 11 Jun 2015 17:26:13 +0000 (10:26 -0700)]
Merge EXTENDED font profile with the next (unnamed) profile.

This is now possible since we have less space restrictions on
devices.

This helps make sure that devices don't mistakenly ship with a
limited font support simply because they didn't turn on the extended
font profile.

Although the larger version of Droid Sans Fallback is no longer used
in any font profile for a device, it is kept since it's used by the
SDK.

The Nanum Gothic font is no longer used in any device profile either,
but it's kept in the fallback chain, so the SDK (that uses it)
continues to work.

Bug: 19668057
Change-Id: I6e32c4c98745e9b6aff6684d993943a19aebf6f7

9 years agoMerge "Protect against null detail record." into mnc-dev
Jason Monk [Thu, 11 Jun 2015 20:06:10 +0000 (20:06 +0000)]
Merge "Protect against null detail record." into mnc-dev

9 years agoMerge "Revert "Permissions: Fix account related permissions."" into mnc-dev
Carlos Valdivia [Thu, 11 Jun 2015 20:04:31 +0000 (20:04 +0000)]
Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev

9 years agoPrevent system uid component from running in an app process
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process

Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404

9 years agoRevert "Permissions: Fix account related permissions."
Carlos Valdivia [Thu, 11 Jun 2015 20:04:04 +0000 (20:04 +0000)]
Revert "Permissions: Fix account related permissions."

This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc

9 years agoCamera2: Legacy: handle FPS range properly
Yin-Chia Yeh [Wed, 10 Jun 2015 17:59:40 +0000 (10:59 -0700)]
Camera2: Legacy: handle FPS range properly

Convert between the FPS range unit of API1 and API2.

Bug: 21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05

9 years agoProtect against null detail record.
Jason Monk [Thu, 11 Jun 2015 19:57:41 +0000 (15:57 -0400)]
Protect against null detail record.

Bug: 21779477
Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a

9 years agoMerge "Ignore some more generic USB device names." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 19:57:23 +0000 (19:57 +0000)]
Merge "Ignore some more generic USB device names." into mnc-dev

9 years agoIgnore some more generic USB device names.
Jeff Sharkey [Thu, 11 Jun 2015 19:47:24 +0000 (12:47 -0700)]
Ignore some more generic USB device names.

Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b

9 years agoTrace each stage of Choreographer driven frames
Chris Craik [Fri, 22 May 2015 01:33:37 +0000 (18:33 -0700)]
Trace each stage of Choreographer driven frames

bug:21374535

Change-Id: I332dac216defbc4517441e2a9cdffdf71731f1e6

9 years agoMerge "Fix the PFD detachFd issue." into mnc-dev
Makoto Onuki [Thu, 11 Jun 2015 19:39:15 +0000 (19:39 +0000)]
Merge "Fix the PFD detachFd issue." into mnc-dev

9 years agoMerge "Add more specific consumer names for common buffer queue endpoints." into...
Eino-Ville Talvala [Thu, 11 Jun 2015 19:36:15 +0000 (19:36 +0000)]
Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev

9 years agoFix the PFD detachFd issue.
Makoto Onuki [Thu, 11 Jun 2015 19:34:22 +0000 (12:34 -0700)]
Fix the PFD detachFd issue.

Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703

9 years agoDoze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
Adam Lesinski [Wed, 10 Jun 2015 00:34:04 +0000 (17:34 -0700)]
Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants

This will allow gservices to tweak the settings and experiment
with different values for various doze constants.

The values are encoded in a string as a key=value list. Ex:

inactive_to=5000,idle_factor=0.01

Bug:21640379
Change-Id: Ie98a0e4893f9b46a64d961d6c5c5169b8b8ad742

9 years agoChange to add STK_PERMISSION for stk related commands.
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
Change to add STK_PERMISSION for stk related commands.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b

9 years agoMerge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885...
Svet Ganov [Thu, 11 Jun 2015 18:52:38 +0000 (18:52 +0000)]
Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev

9 years agoDO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework
Svet Ganov [Thu, 11 Jun 2015 18:48:53 +0000 (11:48 -0700)]
DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework
b/20220885

Instead, move it to GSF:
ag/700092

SUBSCRIBED_FEEDS_READ/WRITE permissions guard the Content Provider
that stores sync feeds for 1p apps (Gmail, Claendar, etc).
The sync feeds are used for delivering and processing
GCM tickle-to-sync messages.

These permissions should not be used by 3rd parties but
if they were, this change will break them.

I don't know the reason these were not in GSF and 'signature'
to begin with. If someone does, please, comment.

Change-Id: I6c4e4c774fea12c7fe7082477c210ad75f007c66

9 years agoMerge "Selected count string needs plurals." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 18:21:07 +0000 (18:21 +0000)]
Merge "Selected count string needs plurals." into mnc-dev

9 years agoPermissions: Fix account related permissions.
Carlos Valdivia [Tue, 9 Jun 2015 02:07:54 +0000 (19:07 -0700)]
Permissions: Fix account related permissions.

Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.

MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.

GET_ACCOUNTS is kept but has been grouped under contacts.

Bug: 20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481

9 years agoam 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from indexing...
Dirk Dougherty [Thu, 11 Jun 2015 17:57:37 +0000 (17:57 +0000)]
am 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs

* commit '405d58fff8a64833f365893d065edf3d17f60f21':
  Doc change: Remove disallow /preview from indexing.

9 years agoMerge "Add bucket that unknown state playback falls into" into mnc-dev
Hyungtae Tim Kim [Thu, 11 Jun 2015 17:53:15 +0000 (17:53 +0000)]
Merge "Add bucket that unknown state playback falls into" into mnc-dev

9 years agoMerge "Remove device initializer status messages" into mnc-dev
Craig Lafayette [Thu, 11 Jun 2015 17:45:01 +0000 (17:45 +0000)]
Merge "Remove device initializer status messages" into mnc-dev

9 years agoam fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc...
Dirk Dougherty [Thu, 11 Jun 2015 17:40:53 +0000 (17:40 +0000)]
am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs

* commit 'fd7432276172790a27bd51b75e61d756772eb33b':
  Doc change: Remove disallow /preview from indexing.

9 years agoMerge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev
Alex Klyubin [Thu, 11 Jun 2015 17:40:07 +0000 (17:40 +0000)]
Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev

9 years agoMerge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
Dirk Dougherty [Thu, 11 Jun 2015 17:31:44 +0000 (17:31 +0000)]
Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs

9 years agoMerge "Disable ResolverComparator's debug logging" into mnc-dev
Adam Powell [Thu, 11 Jun 2015 17:14:03 +0000 (17:14 +0000)]
Merge "Disable ResolverComparator's debug logging" into mnc-dev

9 years agoDisable ResolverComparator's debug logging
Adam Powell [Thu, 11 Jun 2015 17:08:03 +0000 (10:08 -0700)]
Disable ResolverComparator's debug logging

Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81

9 years agoam fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates"""...
Joe Fernandez [Thu, 11 Jun 2015 16:47:20 +0000 (16:47 +0000)]
am fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs

* commit 'fd7a6b03329606caa4e61eab64435b6407c90bf2':
  Revert "Revert "docs: studio 1.2.2.0 updates""

9 years agoam d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview...
Joe Fernandez [Thu, 11 Jun 2015 16:33:02 +0000 (16:33 +0000)]
am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs

* commit 'd1d8b843dd4b7575438339a15e610deafa060f76':
  Revert "Revert "docs: studio 1.2.2.0 updates""

9 years agoMerge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev
Adrian Roos [Thu, 11 Jun 2015 16:24:28 +0000 (16:24 +0000)]
Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev

9 years agoMerge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
Joe Fernandez [Thu, 11 Jun 2015 16:24:24 +0000 (16:24 +0000)]
Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs

9 years agoMerge "Filter hover events for clipped views" into mnc-dev
Adrian Roos [Thu, 11 Jun 2015 16:24:09 +0000 (16:24 +0000)]
Merge "Filter hover events for clipped views" into mnc-dev

9 years agoSelected count string needs plurals.
Jeff Sharkey [Thu, 11 Jun 2015 16:16:19 +0000 (09:16 -0700)]
Selected count string needs plurals.

Bug: 21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499

9 years agoMerge "Align the behaviour of different lock task modes" into mnc-dev
Benjamin Franz [Thu, 11 Jun 2015 16:15:34 +0000 (16:15 +0000)]
Merge "Align the behaviour of different lock task modes" into mnc-dev

9 years agoMake apk entry separator compliant with jar url format
Simon Baldwin [Thu, 11 Jun 2015 16:09:49 +0000 (17:09 +0100)]
Make apk entry separator compliant with jar url format

Bug: http://b/21726698
Bug: http://b/8076853
Change-Id: I4106dd82aeb5d7d66c9988be6e8c8726c78ae08c

9 years agoMerge "Delete TODO and file a bug." into mnc-dev
Jonathan Basseri [Thu, 11 Jun 2015 15:36:32 +0000 (15:36 +0000)]
Merge "Delete TODO and file a bug." into mnc-dev

9 years agoFix CarrierText airplane mode with no sims
Jason Monk [Thu, 11 Jun 2015 15:35:23 +0000 (11:35 -0400)]
Fix CarrierText airplane mode with no sims

CarrierText wouldn't always update the text when airplane mode
changed, because it depended on the subscriptions to change to
know to update. Now have KeyguardUpdateMonitor listen to airplane
mode changes so that we update text when needed.

Bug: 21705446
Change-Id: I64e1194ebb055ad10acd96b33e22b95fe2454425

9 years agoAdd bucket that unknown state playback falls into
Hyungtae Tim Kim [Wed, 10 Jun 2015 21:35:28 +0000 (14:35 -0700)]
Add bucket that unknown state playback falls into

MediaPlayerStressTest some media files are missing on the results as they
were reported neither completed nor erroneous.
This case will fall into a new category named unknown playback state so that
we could track them in media dashboard.

Bug: 21755950
Change-Id: Iefcc3e375c63d952a7d9edb418208209d87b9e08

9 years agoMerge "A11y: Annotate the QS brightness slider properly." into mnc-dev
Dan Sandler [Thu, 11 Jun 2015 14:55:00 +0000 (14:55 +0000)]
Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev

9 years agoA11y: Annotate the QS brightness slider properly.
Dan Sandler [Thu, 11 Jun 2015 13:56:24 +0000 (09:56 -0400)]
A11y: Annotate the QS brightness slider properly.

Instead of just clobbering SeekBar's awesome feedback with
"Display brightness" right on the slider, we move that
string up to the parent and set it as the slider's label.

The new utterance will be: "<standard seekbar feedback> for
<label>", which in this case comes out as:

"Seek control, fifteen percent, for display brightness."

Bug: 20343730
Change-Id: I1223b3b07b6bf67ee3df22094ec5976b5188d968

9 years agoMerge "Fix rotation tile animation" into mnc-dev
Jason Monk [Thu, 11 Jun 2015 14:10:02 +0000 (14:10 +0000)]
Merge "Fix rotation tile animation" into mnc-dev

9 years agoMerge "Volume: Disable seekbar prefs when zen muted." into mnc-dev
John Spurlock [Thu, 11 Jun 2015 14:08:44 +0000 (14:08 +0000)]
Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev

9 years agoMerge "Update Statement Service" into mnc-dev
Joseph Wen [Thu, 11 Jun 2015 13:59:28 +0000 (13:59 +0000)]
Merge "Update Statement Service" into mnc-dev

9 years agoFix rotation tile animation
Jason Monk [Thu, 11 Jun 2015 13:23:16 +0000 (09:23 -0400)]
Fix rotation tile animation

Don't call setAllowAnimation unless there is a state change.
Also don't bother updating the rest of the state as it hasn't
changed.

Bug: 21337755
Change-Id: Ia3357e075c8e65fdb83232b685332c98e16c291d

9 years agoImprove boundary check for for Paint#DrawTextRun.
Keisuke Kuroyanagi [Thu, 11 Jun 2015 11:46:53 +0000 (20:46 +0900)]
Improve boundary check for for Paint#DrawTextRun.

Change-Id: I01027ebb9133240cc1c750824a41dd9fca484c1f

9 years agoMerge "New look and feel for managed profile toast" into mnc-dev
Kenny Guy [Thu, 11 Jun 2015 11:06:54 +0000 (11:06 +0000)]
Merge "New look and feel for managed profile toast" into mnc-dev

9 years agoPropagete document meta-data to custom print UI.
Svet Ganov [Thu, 11 Jun 2015 09:46:45 +0000 (02:46 -0700)]
Propagete document meta-data to custom print UI.

Change-Id: I3f122224e1b311a222969253ae0336177989a414

9 years agoMerge "Permission group is granted if one permission is granted for UI purposes....
Svet Ganov [Thu, 11 Jun 2015 08:17:41 +0000 (08:17 +0000)]
Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev

9 years agoPermission group is granted if one permission is granted for UI purposes.
Svet Ganov [Thu, 11 Jun 2015 08:15:43 +0000 (01:15 -0700)]
Permission group is granted if one permission is granted for UI purposes.

bug:21761217

Change-Id: I02c78225e3883106565d304d5b268e496bca7d89

9 years agoMerge "Added strings to explain why the security method needs to be solved" into...
Selim Cinek [Thu, 11 Jun 2015 08:12:49 +0000 (08:12 +0000)]
Merge "Added strings to explain why the security method needs to be solved" into mnc-dev

9 years agoMerge "API council review feedback for ActionMenuView" into mnc-dev
Chris Banes [Thu, 11 Jun 2015 08:05:38 +0000 (08:05 +0000)]
Merge "API council review feedback for ActionMenuView" into mnc-dev

9 years agoMerge "Add system API to watch for permission changes" into mnc-dev
Svetoslav [Thu, 11 Jun 2015 08:02:03 +0000 (08:02 +0000)]
Merge "Add system API to watch for permission changes" into mnc-dev

9 years agoAdded strings to explain why the security method needs to be solved
Selim Cinek [Thu, 11 Jun 2015 07:34:53 +0000 (00:34 -0700)]
Added strings to explain why the security method needs to be solved

Bug: 21618072
Change-Id: I4feca6a597610b09dc4399ff2e9962d0928f46c0