OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Limit number of fingerprint templates that can be enrolled per device user...
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

9 years agoMerge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
Erik Kline [Tue, 16 Jun 2015 03:43:53 +0000 (03:43 +0000)]
Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev

9 years agoLimit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:39:44 +0000 (20:39 -0700)]
Limit number of fingerprint templates that can be enrolled per device user

This change places an upper limit on the number of fingerprint templates that
can be enrolled per account.  This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.

Fixes bug 20731847

Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28

9 years agoMerge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
Daichi Hirono [Tue, 16 Jun 2015 01:30:28 +0000 (01:30 +0000)]
Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev

9 years agoMerge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 01:17:59 +0000 (01:17 +0000)]
Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

9 years agoFix unnecessairy announcements when collapsing shade
Adrian Roos [Tue, 16 Jun 2015 01:16:58 +0000 (18:16 -0700)]
Fix unnecessairy announcements when collapsing shade

Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330

9 years agoMerge "Add metadata for pre-distortion dimensions." into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 01:12:56 +0000 (01:12 +0000)]
Merge "Add metadata for pre-distortion dimensions." into mnc-dev

9 years agoMerge "Clean up app-link verification policy" into mnc-dev
Christopher Tate [Tue, 16 Jun 2015 01:10:41 +0000 (01:10 +0000)]
Merge "Clean up app-link verification policy" into mnc-dev

9 years agoAdd metadata for pre-distortion dimensions.
Ruben Brunk [Tue, 16 Jun 2015 00:32:06 +0000 (17:32 -0700)]
Add metadata for pre-distortion dimensions.

Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727

9 years agoMerge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 00:51:35 +0000 (00:51 +0000)]
Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev

9 years agoMerge "Bluetooth energy: fix overflow in calculation" into mnc-dev
Adam Lesinski [Tue, 16 Jun 2015 00:46:04 +0000 (00:46 +0000)]
Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev

9 years agoMerge "Fix accessibility ghosts in quick settings detail" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:35:11 +0000 (00:35 +0000)]
Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev

9 years agoAllow killApplicationWithAppId() on secondary users
Makoto Onuki [Tue, 16 Jun 2015 00:26:40 +0000 (17:26 -0700)]
Allow killApplicationWithAppId() on secondary users

Bug 20949609

Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382

9 years agoFix accessibility ghosts in quick settings detail
Adrian Roos [Tue, 16 Jun 2015 00:27:01 +0000 (17:27 -0700)]
Fix accessibility ghosts in quick settings detail

Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.

Bug: 20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d

9 years agoBluetooth energy: fix overflow in calculation
Adam Lesinski [Tue, 16 Jun 2015 00:19:07 +0000 (17:19 -0700)]
Bluetooth energy: fix overflow in calculation

Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671

9 years agoMerge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
Junda Liu [Mon, 15 Jun 2015 23:54:36 +0000 (23:54 +0000)]
Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

9 years agoMerge "Add AssistUtils" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Add AssistUtils" into mnc-dev

9 years agoAdd KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
Junda Liu [Mon, 15 Jun 2015 20:15:28 +0000 (13:15 -0700)]
Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b

9 years agoam 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist...
Quddus Chong [Mon, 15 Jun 2015 23:11:02 +0000 (23:11 +0000)]
am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '418ff64748cb866d3dec8a448efffb0cbceec52d':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoAdd AssistUtils
Adrian Roos [Mon, 15 Jun 2015 20:23:14 +0000 (13:23 -0700)]
Add AssistUtils

Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a

9 years agoFix stuck orientation in SetupWizard
Adrian Roos [Mon, 15 Jun 2015 22:58:35 +0000 (15:58 -0700)]
Fix stuck orientation in SetupWizard

Bug: 21755092
Change-Id: I3144a81523ce2ef4bf6dc457c0ea4b9723dae489

9 years agoam 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 1929857...
Quddus Chong [Mon, 15 Jun 2015 22:59:13 +0000 (22:59 +0000)]
am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '79b30681bbe26b95a8705e17957c1063517ec8f3':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoMerge "Camera2: fix Surface cast issue" into mnc-dev
Zhijun He [Mon, 15 Jun 2015 22:58:47 +0000 (22:58 +0000)]
Merge "Camera2: fix Surface cast issue" into mnc-dev

9 years agoClean up app-link verification policy
Christopher Tate [Sat, 13 Jun 2015 01:31:24 +0000 (18:31 -0700)]
Clean up app-link verification policy

If an app claims to be the official auto-verified app for any domain
and thus the automatic handler for ACTION_VIEW / {http,https}://...
intents naming that domain, then we require that it verify as the
official app for *all* domains it purports to handle, even if the
other domains are not flagged for verify.

Bug 21335460

Change-Id: I3fdd8620defa31aea36ce738fa63ac94fc53c5f7

9 years agoam 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:50:51 +0000 (22:50 +0000)]
am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.

9 years agoMerge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc...
Quddus Chong [Mon, 15 Jun 2015 22:42:41 +0000 (22:42 +0000)]
Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

9 years agoMerge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 22:42:02 +0000 (22:42 +0000)]
Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev

9 years agodocs: Fixed broken links in TV publishing checklist.
Quddus Chong [Mon, 15 Jun 2015 22:27:17 +0000 (15:27 -0700)]
docs: Fixed broken links in TV publishing checklist.
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013

9 years agoam c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:39:12 +0000 (22:39 +0000)]
am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.

9 years agoMerge "Add addional scale component for radialDistortion." into mnc-dev
Ruben Brunk [Mon, 15 Jun 2015 22:34:18 +0000 (22:34 +0000)]
Merge "Add addional scale component for radialDistortion." into mnc-dev

9 years agoAdd addional scale component for radialDistortion.
Ruben Brunk [Mon, 15 Jun 2015 22:33:09 +0000 (15:33 -0700)]
Add addional scale component for radialDistortion.

Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7

9 years agoMerge "Fixed a bug when resolving theme attributes" into mnc-dev
Selim Cinek [Mon, 15 Jun 2015 22:30:50 +0000 (22:30 +0000)]
Merge "Fixed a bug when resolving theme attributes" into mnc-dev

9 years agoam 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:23:24 +0000 (22:23 +0000)]
am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.

9 years agoFix Android Keystore key gen for keys requiring user auth.
Alex Klyubin [Mon, 15 Jun 2015 22:16:09 +0000 (15:16 -0700)]
Fix Android Keystore key gen for keys requiring user auth.

When Android Keystore generates an asymmetric key pair, it needs to
create a self-signed certificate for that pair, in order to expose
the key pair in the JCA KeyStore abstraction through which keys are
later retrieved. The self-signed certificate is normally signed with
the private key.

This CL avoids using the private key to sign the certificate if the
private key can be used only once the user has been authenticated.
For such keys, a fake (non-verifying) signature is used on the
certificate, same as for cases where the key is not authorized for
signing.

Bug: 21852844
Change-Id: Id78bc1f51d12950db4e37c1e0da6c60057d4e693

9 years agoMerge "Adding config variables for triggering CI action on System update." into mnc-dev
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Adding config variables for triggering CI action on System update." into mnc-dev

9 years agoam 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:11:30 +0000 (22:11 +0000)]
am 1ad5c813: Fix typo in TtsSpan.

* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.

9 years agoMerge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev
Raph Levien [Mon, 15 Jun 2015 21:29:45 +0000 (21:29 +0000)]
Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev

9 years agoMerge "Send broadcast when default dialer changes" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 21:23:26 +0000 (21:23 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev

9 years agoFix blink in Explode transition.
George Mount [Thu, 11 Jun 2015 22:32:14 +0000 (15:32 -0700)]
Fix blink in Explode transition.

Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc

9 years agoMerge "QS: Add disable animations for the DND tile." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 21:03:53 +0000 (21:03 +0000)]
Merge "QS: Add disable animations for the DND tile." into mnc-dev

9 years agoQS: Add disable animations for the DND tile.
John Spurlock [Mon, 15 Jun 2015 17:49:57 +0000 (13:49 -0400)]
QS: Add disable animations for the DND tile.

Elide the disabled -> enabled anim, since we launch
the detail panel instead.

Bug: 21118976
Change-Id: I392f848641190f114b7838515acb13f22c96e37d

9 years agoMerge "QS icon sizes should be 24dp." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:14:48 +0000 (20:14 +0000)]
Merge "QS icon sizes should be 24dp." into mnc-dev

9 years agoFixed a bug when resolving theme attributes
Selim Cinek [Mon, 15 Jun 2015 20:09:25 +0000 (13:09 -0700)]
Fixed a bug when resolving theme attributes

This could lead to a crash.

Bug: 21705571
Change-Id: I8afb0725d6af59bdeac97f4aec58d0f4a2406905

9 years agoQS icon sizes should be 24dp.
John Spurlock [Mon, 15 Jun 2015 19:45:38 +0000 (15:45 -0400)]
QS icon sizes should be 24dp.

Not 28dp.

Bug: 21118976
Change-Id: I9cc326d1333d85b783b85e3238a2a506bf3b55c0

9 years agoMerge "Limit shared element transition to shared elements and children." into mnc-dev
George Mount [Mon, 15 Jun 2015 19:43:55 +0000 (19:43 +0000)]
Merge "Limit shared element transition to shared elements and children." into mnc-dev

9 years agoMerge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
Vladislav Kaznacheev [Mon, 15 Jun 2015 19:43:10 +0000 (19:43 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

9 years agoSend broadcast when default dialer changes
Yorke Lee [Mon, 15 Jun 2015 19:08:24 +0000 (12:08 -0700)]
Send broadcast when default dialer changes

Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast

Bug: 21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0

9 years agoMerge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into...
Adam Powell [Mon, 15 Jun 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev

9 years agoMerge "Only re-register callbacks if tuning changed" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:24:09 +0000 (19:24 +0000)]
Merge "Only re-register callbacks if tuning changed" into mnc-dev

9 years agoOnly re-register callbacks if tuning changed
Jason Monk [Mon, 15 Jun 2015 19:02:56 +0000 (15:02 -0400)]
Only re-register callbacks if tuning changed

We only need to get the state if the tuning has actually changed.
Currently we hit this every time we open QS which breaks the alpha
animation on the mobile icon.

Bug: 21791609
Change-Id: I3d77a2d0f81d2d7bed600ccd7a2d2c2b4a262db7

9 years agoMerge "Fix EmergencyCallback in NetworkController" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:16:35 +0000 (19:16 +0000)]
Merge "Fix EmergencyCallback in NetworkController" into mnc-dev

9 years agoMerge "Fix issue #21813831: Need API for asking to be added to power whitelist" into...
Dianne Hackborn [Mon, 15 Jun 2015 19:12:12 +0000 (19:12 +0000)]
Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev

9 years agoFix issue #21813831: Need API for asking to be added to power whitelist
Dianne Hackborn [Sat, 13 Jun 2015 01:11:41 +0000 (18:11 -0700)]
Fix issue #21813831: Need API for asking to be added to power whitelist

Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5

9 years agoMerge "Obtain handler from context in CaptioningManager" into mnc-dev
Alan Viverette [Mon, 15 Jun 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Obtain handler from context in CaptioningManager" into mnc-dev

9 years agoMerge "Use HTTPS when fetching app link verification resources" into mnc-dev
Christopher Tate [Mon, 15 Jun 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Use HTTPS when fetching app link verification resources" into mnc-dev

9 years agoMerge "Retry intent verification 3 times before failing." into mnc-dev
Joseph Wen [Mon, 15 Jun 2015 17:50:13 +0000 (17:50 +0000)]
Merge "Retry intent verification 3 times before failing." into mnc-dev

9 years agoMerge "Remove EcIesParameterSpec until it's needed." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:45:45 +0000 (17:45 +0000)]
Merge "Remove EcIesParameterSpec until it's needed." into mnc-dev

9 years agoMerge "Document when self-signed certs have invalid signature." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:43:45 +0000 (17:43 +0000)]
Merge "Document when self-signed certs have invalid signature." into mnc-dev

9 years agoFix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 17:24:02 +0000 (13:24 -0400)]
Fix typo in TtsSpan.

Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880

9 years agoRemove EcIesParameterSpec until it's needed.
Alex Klyubin [Mon, 15 Jun 2015 16:55:36 +0000 (09:55 -0700)]
Remove EcIesParameterSpec until it's needed.

This class was added in Android M to enable us to expose ECIES. ECIES
is not going to happen in Android M. I'm thus removing this unused
class until such time when it's needed.

Bug: 18088752
Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32

9 years agoCamera2: fix Surface cast issue
Zhijun He [Mon, 15 Jun 2015 16:43:55 +0000 (09:43 -0700)]
Camera2: fix Surface cast issue

Can not cast an object array directly to a Surface array.

Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf

9 years agoMerge "Add adb shell telecom get-system-dialer" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 16:19:41 +0000 (16:19 +0000)]
Merge "Add adb shell telecom get-system-dialer" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 16:15:45 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 16:14:54 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I72bd7dadaaf60d676140eedd28f33db15c5bfeb6
Auto-generated-cl: translation import

9 years agoam fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shado...
Diego Perez [Mon, 15 Jun 2015 15:48:29 +0000 (15:48 +0000)]
am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit 'fa794eb0025dbec6c1b90135495081d42f06bdaf':
  Fix for shadows on theme editor

9 years agoam 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapsho...
Diego Perez [Mon, 15 Jun 2015 15:48:24 +0000 (15:48 +0000)]
am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit '40a216d95973bb897ee0d755ef260a616f176798':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree...
Dirk Dougherty [Mon, 15 Jun 2015 15:48:14 +0000 (15:48 +0000)]
am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs

* commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7':
  Doc change: move ndk docs jd into main docs tree.

9 years agoam ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing...
Andrew Solovay [Mon, 15 Jun 2015 15:48:05 +0000 (15:48 +0000)]
am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs

* commit 'ecc50268d72f0084a96bf98494229a294be10458':
  docs: Added AfW videos to "Android for Work" landing page

9 years agoam afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc...
Rich Slogar [Mon, 15 Jun 2015 15:47:49 +0000 (15:47 +0000)]
am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs

* commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20':
  docs: sdk tools 24.3.2 download updates

9 years agoam ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom...
Diego Perez [Mon, 15 Jun 2015 15:47:44 +0000 (15:47 +0000)]
am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev

* commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
  New custom widgets library

9 years agoMerge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
Chet Haase [Mon, 15 Jun 2015 15:45:55 +0000 (15:45 +0000)]
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev

9 years agoMerge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:44:12 +0000 (15:44 +0000)]
Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev

9 years agoAdd isFilterBitmap() overrides where appropriate
Chet Haase [Sun, 14 Jun 2015 14:45:32 +0000 (07:45 -0700)]
Add isFilterBitmap() overrides where appropriate

Issue #21825791 add isFilterBitmap() override to appropriate Drawable subclasses

Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d

9 years agoMerge "Don't try to get entries for uninstalled apps." into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:41:36 +0000 (15:41 +0000)]
Merge "Don't try to get entries for uninstalled apps." into mnc-dev

9 years agoDon't try to get entries for uninstalled apps.
Jason Monk [Mon, 15 Jun 2015 15:38:03 +0000 (11:38 -0400)]
Don't try to get entries for uninstalled apps.

Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0

9 years agoresolved conflicts for merge of 5a53816b to mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:17:08 +0000 (16:17 +0100)]
resolved conflicts for merge of 5a53816b to mnc-dev

Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f

9 years agoRetry intent verification 3 times before failing.
Joseph Wen [Mon, 15 Jun 2015 14:36:03 +0000 (10:36 -0400)]
Retry intent verification 3 times before failing.

BUG=21596311

Change-Id: Ia98925a4310046ef4d8117afe0b278e6a414dac6

9 years agoam a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT...
Prashant Malani [Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)]
am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"

9 years agoam 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashM...
Filip Gruszczynski [Mon, 15 Jun 2015 14:30:30 +0000 (14:30 +0000)]
am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev

* commit '94476be6a4055d09413d51e489446bf220c440a6':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

9 years agoam d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b3845...
Leon Scroggins III [Mon, 15 Jun 2015 14:30:25 +0000 (14:30 +0000)]
am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

* commit 'd7959d30b61962a905de6c5081dac6b2f7be65c1':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

9 years agoam 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw...
Leon Scroggins III [Mon, 15 Jun 2015 14:30:20 +0000 (14:30 +0000)]
am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

* commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

9 years agoMerge "Fix invisible rotation tile" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:26:36 +0000 (14:26 +0000)]
Merge "Fix invisible rotation tile" into mnc-dev

9 years agoFix invisible rotation tile
Jason Monk [Mon, 15 Jun 2015 14:19:26 +0000 (10:19 -0400)]
Fix invisible rotation tile

Make sure we set the state at least once.

Bug: 21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98

9 years agoMerge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:14:50 +0000 (14:14 +0000)]
Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev

9 years agoMake references to ssid use a verbatim TtsSpan
Jason Monk [Mon, 15 Jun 2015 14:07:55 +0000 (10:07 -0400)]
Make references to ssid use a verbatim TtsSpan

Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:53:09 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:51:34 +0000 (08:51 -0500)]
Import translations. DO NOT MERGE

Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:45:41 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:44:44 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:43:30 +0000 (08:43 -0500)]
Import translations. DO NOT MERGE

Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:39:05 +0000 (08:39 -0500)]
Import translations. DO NOT MERGE

Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import

9 years agoMerge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
Paul Jensen [Mon, 15 Jun 2015 13:35:46 +0000 (13:35 +0000)]
Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev

9 years agoMerge "remove setLatestEventInfo from USB" into mnc-dev
Chris Wren [Mon, 15 Jun 2015 12:23:23 +0000 (12:23 +0000)]
Merge "remove setLatestEventInfo from USB" into mnc-dev

9 years agoam 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme...
Diego Perez [Mon, 15 Jun 2015 10:14:30 +0000 (10:14 +0000)]
am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '2f7103565cf1732d6d1281195cfa49a1564751d7':
  Fix for shadows on theme editor

9 years agoam df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer...
Diego Perez [Mon, 15 Jun 2015 10:14:24 +0000 (10:14 +0000)]
am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into...
Diego Perez [Mon, 15 Jun 2015 10:04:02 +0000 (10:04 +0000)]
am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor

9 years agoam 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clippin...
Diego Perez [Mon, 15 Jun 2015 10:03:58 +0000 (10:03 +0000)]
am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 09:50:58 +0000 (09:50 +0000)]
am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor

9 years agoam b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used...
Diego Perez [Mon, 15 Jun 2015 09:50:51 +0000 (09:50 +0000)]
am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.

9 years agoam 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 09:36:39 +0000 (09:36 +0000)]
am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
  Fix for shadows on theme editor