OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Mon, 1 Jun 2015 14:05:57 +0000 (14:05 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 14:05:47 +0000 (14:05 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 50d10ccbc092d28533e6730c7e5abe10d785d0ce.

Change-Id: I689bf971848ebec0a88282c39e57113aee6d44cb

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 13:49:22 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:48:42 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 1d66281e: am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consi...
Neil Fuller [Mon, 1 Jun 2015 12:41:23 +0000 (12:41 +0000)]
am 1d66281e: am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"

* commit '1d66281e4b1ffb2950e93f4473144cb4e68a6b62':
  Fix javadocs based on recent case consistency change

9 years agoam 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:26:01 +0000 (12:26 +0000)]
am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"

* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change

9 years agoam e761938c: Merge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:14:47 +0000 (12:14 +0000)]
am e761938c: Merge "Fix javadocs based on recent case consistency change"

* commit 'e761938c39c1cafa80d0c474e107041316a49cbd':
  Fix javadocs based on recent case consistency change

9 years agoMerge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"

9 years agoMerge "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Sat, 30 May 2015 05:23:12 +0000 (05:23 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 05:22:59 +0000 (05:22 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit c48b8785efb6ad1103b50d53130476b82c62824d.

Change-Id: I31f53bf893bd60834a608b48205843861efc5430

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:41:19 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:41:02 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 04:31:39 +0000 (21:31 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 04:28:16 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:15:42 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 04:15:06 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:13:48 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 04:11:45 +0000 (21:11 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Sat, 30 May 2015 04:11:14 +0000 (04:11 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:11:03 +0000 (04:11 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit d2c3a7d7cca2bd828266cd362b00d7d2dfd41f5c.

Change-Id: Idd6e026369a191b5e4449c8decbba8d08e20de92

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:09:06 +0000 (04:09 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 04:08:14 +0000 (21:08 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:02:11 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 04:01:50 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:59:13 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:55:56 +0000 (20:55 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 03:54:27 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:52:37 +0000 (20:52 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 03:51:02 +0000 (03:51 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:49:11 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 03:45:14 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 30 May 2015 03:44:56 +0000 (03:44 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:42:24 +0000 (20:42 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 03:39:05 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 23:03:18 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 22:55:54 +0000 (17:55 -0500)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Don't open QS on first notification pull down"
Jorim Jaggi [Fri, 29 May 2015 22:11:28 +0000 (22:11 +0000)]
Merge "Don't open QS on first notification pull down"

9 years agoam 533d164e: am 0189c6ef: am dd783301: Merge "Add optional additional entropy to...
Chad Brubaker [Fri, 29 May 2015 22:01:04 +0000 (22:01 +0000)]
am 533d164e: am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"

* commit '533d164ed0263c682b5868a0e0f021a95ec9a9fe':
  Add optional additional entropy to finish

9 years agoam 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)]
am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"

* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish

9 years agoam dd783301: Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:31:52 +0000 (21:31 +0000)]
am dd783301: Merge "Add optional additional entropy to finish"

* commit 'dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
  Add optional additional entropy to finish

9 years agoMerge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Add optional additional entropy to finish"

9 years agoAdd optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 19:32:51 +0000 (12:32 -0700)]
Add optional additional entropy to finish

If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58

9 years agofix NPE in shutdown thread
Guang Zhu [Fri, 29 May 2015 03:50:03 +0000 (20:50 -0700)]
fix NPE in shutdown thread

null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
(cherry picked from commit 9bb765448df43d41e0a3edb7de1d1641c9251c35)

9 years agoMerge "Remove AccessibilityAction.ACTION_CLICK from AbsListView."
Maxim Bogatov [Fri, 29 May 2015 17:49:27 +0000 (17:49 +0000)]
Merge "Remove AccessibilityAction.ACTION_CLICK from AbsListView."

9 years agoam bd613068: resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp
Narayan Kamath [Fri, 29 May 2015 10:08:43 +0000 (10:08 +0000)]
am bd613068: resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp

* commit 'bd613068a38f5ae953e348e308d46271c4a59cec':
  Patches for IKeyguardStateCallback

9 years agoresolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp
Narayan Kamath [Fri, 29 May 2015 09:58:32 +0000 (10:58 +0100)]
resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp

Change-Id: Ib895c959b7403f959f326881a1dea4b81dda73e3

9 years agoam 4eb5f942: am d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 09:53:55 +0000 (09:53 +0000)]
am 4eb5f942: am d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"

* commit '4eb5f942b70108b69749682511d036177a8f0d1f':
  Close race condition in binderDied()

9 years agoam d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 09:43:23 +0000 (09:43 +0000)]
am d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"

* commit 'd6acfc6219fd6a47b267e8f31a83773862759890':
  Close race condition in binderDied()

9 years agoam 4993da92: Merge "Patches for IKeyguardStateCallback"
Narayan Kamath [Fri, 29 May 2015 09:39:43 +0000 (09:39 +0000)]
am 4993da92: Merge "Patches for IKeyguardStateCallback"

* commit '4993da924c6f25194aded71e70eefd07208eee81':
  Patches for IKeyguardStateCallback

9 years agoMerge "Patches for IKeyguardStateCallback"
Narayan Kamath [Fri, 29 May 2015 09:26:16 +0000 (09:26 +0000)]
Merge "Patches for IKeyguardStateCallback"

9 years agoPatches for IKeyguardStateCallback
dooyoung.hwang [Thu, 21 May 2015 07:09:43 +0000 (16:09 +0900)]
Patches for IKeyguardStateCallback

1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.

2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.

3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.

Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
9 years agoam 90cfc192: Merge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 09:25:16 +0000 (09:25 +0000)]
am 90cfc192: Merge "Close race condition in binderDied()"

* commit '90cfc1923ae0a9fe98b97d123b2250f01e8bc3f2':
  Close race condition in binderDied()

9 years agoMerge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 08:34:02 +0000 (08:34 +0000)]
Merge "Close race condition in binderDied()"

9 years agoClose race condition in binderDied()
Christopher Tate [Wed, 20 May 2015 01:16:58 +0000 (18:16 -0700)]
Close race condition in binderDied()

It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort.  We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

(cherry picked from commit 090c08ff2a7525c830b4edfd1a79aa8ee3893c60)

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab

9 years agoam c6fb8f82: am 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when...
Yohei Yukawa [Fri, 29 May 2015 02:04:38 +0000 (02:04 +0000)]
am c6fb8f82: am 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev

* commit 'c6fb8f827d6e233b7a586552bbeac14fabcf92bd':
  Clear the inset of previous IME when necessary.

9 years agoam 8e5d21b0: am 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1...
Santos Cordon [Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)]
am 8e5d21b0: am 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

* commit '8e5d21b0430a68afd8c2ab5a72164db75e69b490':
  Add extras to Connections/Calls. (1/3)

9 years agoam f224d877: am f1ff9cb2: am ff0c25ce: Merge "Cleaning up logging in TelephonyManager...
Amit Mahajan [Fri, 29 May 2015 02:04:25 +0000 (02:04 +0000)]
am f224d877: am f1ff9cb2: am ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev

* commit 'f224d877e1e885f313c9c61eb69d7431cec25649':
  Cleaning up logging in TelephonyManager.

9 years agoam 5cb48687: am 9fa1be21: am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few...
David Friedman [Fri, 29 May 2015 02:04:20 +0000 (02:04 +0000)]
am 5cb48687: am 9fa1be21: am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '5cb48687ecc40c8f3eb46ba94b8c5f08fcdb6948':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoam 29917db5: am c11c1890: am a9ac8354: Merge "Clean up calls to Rect.intersect()...
Doris Liu [Fri, 29 May 2015 02:03:56 +0000 (02:03 +0000)]
am 29917db5: am c11c1890: am a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev

* commit '29917db5fa93d6649c05f643284296da34d0b3a0':
  Clean up calls to Rect.intersect()

9 years agoam 67cf94ba: am b182d570: am 626f0dc7: Merge "Deprecations are warnings not errors...
Glenn Kasten [Fri, 29 May 2015 02:03:50 +0000 (02:03 +0000)]
am 67cf94ba: am b182d570: am 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev

* commit '67cf94ba85a74acfb72658ca22290655aab60f0c':
  Deprecations are warnings not errors

9 years agoam 830ac05c: am 7b2c58b3: am da28c868: Merge "Fix round cap approximation to understa...
Chris Craik [Fri, 29 May 2015 02:03:44 +0000 (02:03 +0000)]
am 830ac05c: am 7b2c58b3: am da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev

* commit '830ac05cc28fb06fe5057c01ec4f944c78c711ea':
  Fix round cap approximation to understand scale

9 years agoam 6d22cb29: am aa720a99: am b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes...
David Friedman [Fri, 29 May 2015 02:03:38 +0000 (02:03 +0000)]
am 6d22cb29: am aa720a99: am b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit '6d22cb29707681de3731bf368de2a40030cc6391':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 58073c9e: am 987e2403: am 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training...
Quddus Chong [Fri, 29 May 2015 02:03:33 +0000 (02:03 +0000)]
am 58073c9e: am 987e2403: am 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit '58073c9ec26792b6e23364a408d8ee3f044af0d5':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoam a001e51f: am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service...
Wale Ogunwale [Fri, 29 May 2015 02:03:27 +0000 (02:03 +0000)]
am a001e51f: am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev

* commit 'a001e51f3ede9848955a1ab3b0a5fd24b4321e2a':
  Fix build
  Don't kill process with active service/receiver when task is removed.

9 years agoam 51d2185d: am 1d39d1bd: am 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
Alan Viverette [Fri, 29 May 2015 02:03:26 +0000 (02:03 +0000)]
am 51d2185d: am 1d39d1bd: am 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev

* commit '51d2185db2dd4d1a80156dc434165f275e61d8f3':
  Fix drawable CTS breakages

9 years agoam 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when necessary....
Yohei Yukawa [Fri, 29 May 2015 00:29:14 +0000 (00:29 +0000)]
am 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev

* commit '98e8890022119bc9d053b55d2f05617b6d7bacb9':
  Clear the inset of previous IME when necessary.

9 years agoam 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Fri, 29 May 2015 00:29:02 +0000 (00:29 +0000)]
am 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

* commit '5144a0d8c9e054bc361cc7c860e1a2baff865c6a':
  Add extras to Connections/Calls. (1/3)

9 years agoam f1ff9cb2: am ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Fri, 29 May 2015 00:28:57 +0000 (00:28 +0000)]
am f1ff9cb2: am ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev

* commit 'f1ff9cb2ee598e68f419a1b7a0fc5a8e3f140e3a':
  Cleaning up logging in TelephonyManager.

9 years agoam 9fa1be21: am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor correcti...
David Friedman [Fri, 29 May 2015 00:28:51 +0000 (00:28 +0000)]
am 9fa1be21: am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '9fa1be2155db6af01cbe8762ec64639034c645fd':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoam 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:35:28 +0000 (23:35 +0000)]
am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev

* commit '85b883cae410bd2b8e1dc5c34265ed253d758e86':
  Clear the inset of previous IME when necessary.

9 years agoam c11c1890: am a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
Doris Liu [Thu, 28 May 2015 23:30:29 +0000 (23:30 +0000)]
am c11c1890: am a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev

* commit 'c11c1890f6478498de0ca30b720b628b0fbce45b':
  Clean up calls to Rect.intersect()

9 years agoam b182d570: am 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 23:30:22 +0000 (23:30 +0000)]
am b182d570: am 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev

* commit 'b182d570c46330e95301dd46bc15c1b631e9ca42':
  Deprecations are warnings not errors

9 years agoam 7b2c58b3: am da28c868: Merge "Fix round cap approximation to understand scale...
Chris Craik [Thu, 28 May 2015 23:30:17 +0000 (23:30 +0000)]
am 7b2c58b3: am da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev

* commit '7b2c58b3e5a4c5b901a246b512d68273b7ae7b41':
  Fix round cap approximation to understand scale

9 years agoam aa720a99: am b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link...
David Friedman [Thu, 28 May 2015 23:30:11 +0000 (23:30 +0000)]
am aa720a99: am b3af4f43: am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit 'aa720a99d5318004f8e7f1ff222ea42ecaf3a4ca':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 987e2403: am 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatti...
Quddus Chong [Thu, 28 May 2015 23:30:05 +0000 (23:30 +0000)]
am 987e2403: am 2f9f8a38: am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit '987e2403ea67ab07f8c3a53f3547beb4d3b14608':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoam 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service/receiver...
Wale Ogunwale [Thu, 28 May 2015 23:29:58 +0000 (23:29 +0000)]
am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev

* commit '0dbc5b582c40bf8830362fe0bb5b64d100d7fe5d':
  Don't kill process with active service/receiver when task is removed.

9 years agoam 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev
Chris Craik [Thu, 28 May 2015 23:29:52 +0000 (23:29 +0000)]
am 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev

* commit '94cb7ef35046c9dc9d94a3bfff18f695d635a308':
  Fix build

9 years agoam 1d39d1bd: am 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:29:47 +0000 (23:29 +0000)]
am 1d39d1bd: am 4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev

* commit '1d39d1bdfbad545d7602ba198bcd1a03b48feb86':
  Fix drawable CTS breakages

9 years agoMerge "Clear the inset of previous IME when necessary." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:20:11 +0000 (23:20 +0000)]
Merge "Clear the inset of previous IME when necessary." into mnc-dev

9 years agoam 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:18:34 +0000 (23:18 +0000)]
am 7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

* commit '7cb0925e7e89a415a101f83e32d4f5e51f768ffd':
  Add extras to Connections/Calls. (1/3)

9 years agoam ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:18:29 +0000 (23:18 +0000)]
am ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev

* commit 'ff0c25ce3174bd4f76256e413beb81f6eb501da9':
  Cleaning up logging in TelephonyManager.

9 years agoam 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted...
David Friedman [Thu, 28 May 2015 23:18:24 +0000 (23:18 +0000)]
am 36756947: am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '3675694775d69712a2c9d5ee1d39dd2a5127cc86':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoMerge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:06:15 +0000 (23:06 +0000)]
Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

9 years agoMerge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:05:27 +0000 (23:05 +0000)]
Merge "Cleaning up logging in TelephonyManager." into mnc-dev

9 years agoam f5afa201: am 37810207: am 1cd7e4c3: Merge "Use path intersection instead of saveLa...
Chris Craik [Thu, 28 May 2015 23:01:28 +0000 (23:01 +0000)]
am f5afa201: am 37810207: am 1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev

* commit 'f5afa201c32f65fc14b2ac657681cb6c1722f663':
  Use path intersection instead of saveLayer+mesh to mask projected ripples

9 years agoam 4198e34a: am f5b914cf: am 5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAt...
Deepanshu Gupta [Thu, 28 May 2015 23:01:22 +0000 (23:01 +0000)]
am 4198e34a: am f5b914cf: am 5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev

* commit '4198e34acfc5aca2fe2e0b977e458d786cbacd7a':
  Fix NPE in BridgeContext.obtainStyledAttributes()

9 years agoam fbf62ad0: am 47c99a5d: am 1421583b: Merge "Fix BridgeTypedArray.getType()" into...
Deepanshu Gupta [Thu, 28 May 2015 23:01:17 +0000 (23:01 +0000)]
am fbf62ad0: am 47c99a5d: am 1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev

* commit 'fbf62ad0f3cbea7f8bfa261c66d1d823be66eb6d':
  Fix BridgeTypedArray.getType()

9 years agoam 69dd849e: am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before reboo...
Tao Bao [Thu, 28 May 2015 23:01:12 +0000 (23:01 +0000)]
am 69dd849e: am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev

* commit '69dd849ed3c189436025eb8914321892424af259':
  Wait for uncrypt to finish before rebooting

9 years agoam e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent...
Dianne Hackborn [Thu, 28 May 2015 23:01:05 +0000 (23:01 +0000)]
am e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev

* commit 'e6562d903b9e62b4d4c6c08307a39577f15f1c49':
  Add new API to set URI on AssistContent.

9 years agoam 1ca3ddb0: am 0f167ab4: am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 23:01:00 +0000 (23:01 +0000)]
am 1ca3ddb0: am 0f167ab4: am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev

* commit '1ca3ddb070dd53d33b788a34d446b003bdf73b36':
  Update asan/app_process.

9 years agoam f06e3860: am 3ef682bd: am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc...
Quddus Chong [Thu, 28 May 2015 23:00:47 +0000 (23:00 +0000)]
am f06e3860: am 3ef682bd: am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit 'f06e3860a1c38b7ad856dacfb2b9e8090cbfc7ce':
  docs: Misc. fixes for M Preview docs.

9 years agoam 74d340b4: am 1dfb539b: am aa47d8d9: Merge "Revert "Revert "Remove debugging and...
Olawale Ogunwale [Thu, 28 May 2015 23:00:41 +0000 (23:00 +0000)]
am 74d340b4: am 1dfb539b: am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

* commit '74d340b467f3c2d4ab19d4fb596212b5d72ff31f':
  Revert "Revert "Remove debugging and skip InputMethod windows""

9 years agoam 197a8003: am 87d969a8: am 517f3ee4: Merge "Backup/restore notification policy...
John Spurlock [Thu, 28 May 2015 23:00:36 +0000 (23:00 +0000)]
am 197a8003: am 87d969a8: am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev

* commit '197a8003168fb02692442a3cb7e2eff2f739388f':
  Backup/restore notification policy.

9 years agoam 937b7ad9: am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect...
Doris Liu [Thu, 28 May 2015 23:00:30 +0000 (23:00 +0000)]
am 937b7ad9: am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev

* commit '937b7ad9f78ea10e001aca6ecbfbf0a15e0b7778':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag

9 years agoam 33e186c2: am 0ea60834: am 6ac0c8c5: lock device orientation during app compatibili...
Guang Zhu [Thu, 28 May 2015 23:00:24 +0000 (23:00 +0000)]
am 33e186c2: am 0ea60834: am 6ac0c8c5: lock device orientation during app compatibility test

* commit '33e186c26d19a193546f6ab1e02a227afceeaa52':
  lock device orientation during app compatibility test

9 years agoam aeb5789d: am fc2cb155: am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce...
Bryce Lee [Thu, 28 May 2015 23:00:19 +0000 (23:00 +0000)]
am aeb5789d: am fc2cb155: am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit 'aeb5789d47f3ded6281e1b2b71996a278e3fc4af':
  Introduce indirection for base micro themes.

9 years agoam 1d4db0e4: am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi contr...
Adam Lesinski [Thu, 28 May 2015 23:00:13 +0000 (23:00 +0000)]
am 1d4db0e4: am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

* commit '1d4db0e4a6fbe73a2d94665184c031d5b5efff59':
  BatteryStats: Output per-app wifi controller distribution

9 years agoam 4abcbcb8: am 2da36fb3: am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick...
David Friedman [Thu, 28 May 2015 23:00:08 +0000 (23:00 +0000)]
am 4abcbcb8: am 2da36fb3: am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit '4abcbcb8dd02f9daa5ef6602e70a5af589468536':
  Docs: Quick typo fix.

9 years agoam 8c962eee: am 1532af39: am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad headin...
Luan Nguyen [Thu, 28 May 2015 23:00:03 +0000 (23:00 +0000)]
am 8c962eee: am 1532af39: am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '8c962eeefd8156557fc3b56174ffbc0f6aaa085c':
  docs: Fix bad heading link for doze-standby

9 years agoam a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
Doris Liu [Thu, 28 May 2015 22:57:22 +0000 (22:57 +0000)]
am a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev

* commit 'a9ac835437f45c7f7f3fc53f56aec2d53390fa72':
  Clean up calls to Rect.intersect()