OSDN Git Service
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
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)
Maxim Bogatov [Fri, 29 May 2015 17:49:27 +0000 (17:49 +0000)]
Merge "Remove AccessibilityAction.ACTION_CLICK from AbsListView."
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
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
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()
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()
Narayan Kamath [Fri, 29 May 2015 09:39:43 +0000 (09:39 +0000)]
am
4993da92: Merge "Patches for IKeyguardStateCallback"
* commit '
4993da924c6f25194aded71e70eefd07208eee81':
Patches for IKeyguardStateCallback
Narayan Kamath [Fri, 29 May 2015 09:26:16 +0000 (09:26 +0000)]
Merge "Patches 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>
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()
Narayan Kamath [Fri, 29 May 2015 08:34:02 +0000 (08:34 +0000)]
Merge "Close 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
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.
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)
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.
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.
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()
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
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
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.
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.
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.
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
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.
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)
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.
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.
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.
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()
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
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
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.
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.
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.
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
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
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
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)
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.
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.
Santos Cordon [Thu, 28 May 2015 23:06:15 +0000 (23:06 +0000)]
Merge "Add extras to Connections/Calls. (1/3)" 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
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
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()
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()
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
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.
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.
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.
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""
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.
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
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
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.
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
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.
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
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()
Glenn Kasten [Thu, 28 May 2015 22:57:17 +0000 (22:57 +0000)]
am
626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
* commit '
626f0dc73bc1007d16688eddf29ea58ec26f424e':
Deprecations are warnings not errors
Chris Craik [Thu, 28 May 2015 22:57:08 +0000 (22:57 +0000)]
am
da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev
* commit '
da28c8681a6868d188431aed626abe9bd6da2502':
Fix round cap approximation to understand scale
David Friedman [Thu, 28 May 2015 22:57:03 +0000 (22:57 +0000)]
am
b3af4f43: am
9ffbf9bd: am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
b3af4f43d747d214c834ff824fd3116d4728b817':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Quddus Chong [Thu, 28 May 2015 22:56:59 +0000 (22:56 +0000)]
am
2f9f8a38: am
01c4d8d3: am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
2f9f8a38f1d669f3e4a43c087a98c3464c1ad947':
docs: Fixed training TOC formatting and broken link in TV training landing.
Wale Ogunwale [Thu, 28 May 2015 22:56:53 +0000 (22:56 +0000)]
am
c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev
* commit '
c7cbdd11c322daa3a3c7acbf7e457c3ccf34c4d3':
Don't kill process with active service/receiver when task is removed.
Chris Craik [Thu, 28 May 2015 22:56:47 +0000 (22:56 +0000)]
am
2df124b8: Merge "Fix build" into mnc-dev
* commit '
2df124b8547c4ba7a2b0c9903f21811583f74184':
Fix build
Alan Viverette [Thu, 28 May 2015 22:56:43 +0000 (22:56 +0000)]
am
4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
* commit '
4562f0bc898317887f82d62472a3bbbe7b4517f3':
Fix drawable CTS breakages
David Friedman [Thu, 28 May 2015 22:54:29 +0000 (22:54 +0000)]
am
c397dde1: am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
c397dde17960f2308ecc3ef0b5143c95df8e160c':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Yohei Yukawa [Thu, 28 May 2015 01:54:18 +0000 (18:54 -0700)]
Clear the inset of previous IME when necessary.
In the following scenario, the system continues keeping the previous
IME's inset in the display until the new IME shows its window.
1. an IME shows its software keyboard with reporting non-empty inset.
2. the user switches to another IME, which does not show the software
keyboard when it is selected (e.g., because the physical keyboard
is connected.)
This CL tries to address above situation by introducing a new state
flag IMMS#mShouldClearInsetOfPreviousIme to clear the previous IME's
inset when necessary.
Bug:
15922840
Change-Id: Ib04967f39b2529251e4835c42e9f99dba2cf43f2
Chris Craik [Thu, 28 May 2015 22:51:44 +0000 (22:51 +0000)]
am
37810207: am
1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
* commit '
378102071d180c3dc396f4b55861a486725b35d4':
Use path intersection instead of saveLayer+mesh to mask projected ripples
Doris Liu [Thu, 28 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Clean up calls to Rect.intersect()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 22:51:39 +0000 (22:51 +0000)]
am
f5b914cf: am
5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
* commit '
f5b914cf2c7b94a0d455efe9a3b8bf7f8f10ff16':
Fix NPE in BridgeContext.obtainStyledAttributes()
Deepanshu Gupta [Thu, 28 May 2015 22:51:34 +0000 (22:51 +0000)]
am
47c99a5d: am
1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev
* commit '
47c99a5d8534b1846d6c5cc1e0d2eeff5994c32f':
Fix BridgeTypedArray.getType()
Glenn Kasten [Thu, 28 May 2015 22:51:15 +0000 (22:51 +0000)]
Merge "Deprecations are warnings not errors" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fix round cap approximation to understand scale" into mnc-dev
David Friedman [Thu, 28 May 2015 22:40:16 +0000 (22:40 +0000)]
am
9ffbf9bd: am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
9ffbf9bd9b40487b7edacdf0c790714f080494c4':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Quddus Chong [Thu, 28 May 2015 22:40:01 +0000 (22:40 +0000)]
am
01c4d8d3: am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
01c4d8d357aef661d15ef770986e35be324c6d03':
docs: Fixed training TOC formatting and broken link in TV training landing.
Doris Liu [Thu, 28 May 2015 22:35:52 +0000 (15:35 -0700)]
Clean up calls to Rect.intersect()
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.
bug:
7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
Wale Ogunwale [Thu, 28 May 2015 22:38:02 +0000 (22:38 +0000)]
Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev
Tao Bao [Thu, 28 May 2015 22:35:45 +0000 (22:35 +0000)]
am
5f90a8c5: am
165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
* commit '
5f90a8c5bd689afa8403d7dce967bf96a82880c4':
Wait for uncrypt to finish before rebooting
Dianne Hackborn [Thu, 28 May 2015 22:35:39 +0000 (22:35 +0000)]
am
da71e100: am
4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
* commit '
da71e1004082427e36db21c39f47b13e0afa8ed4':
Add new API to set URI on AssistContent.
Evgenii Stepanov [Thu, 28 May 2015 22:35:31 +0000 (22:35 +0000)]
am
0f167ab4: am
bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
* commit '
0f167ab4b189a017ed11311683e2824799ea8d01':
Update asan/app_process.
Quddus Chong [Thu, 28 May 2015 22:35:25 +0000 (22:35 +0000)]
am
3ef682bd: am
0e591ef2: am
7138643f: am
d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
* commit '
3ef682bd361a41a6c5a088ce8f902dec8eacc56e':
docs: Misc. fixes for M Preview docs.
Olawale Ogunwale [Thu, 28 May 2015 22:35:17 +0000 (22:35 +0000)]
am
1dfb539b: am
aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
* commit '
1dfb539b50fbcf06ee750935d9a4771bff1173ab':
Revert "Revert "Remove debugging and skip InputMethod windows""
John Spurlock [Thu, 28 May 2015 22:35:02 +0000 (22:35 +0000)]
am
87d969a8: am
517f3ee4: Merge "Backup/restore notification policy." into mnc-dev
* commit '
87d969a8938b4fab1aa0c394145727b667f8d1c4':
Backup/restore notification policy.
Chris Craik [Thu, 28 May 2015 22:34:53 +0000 (22:34 +0000)]
Merge "Fix build" into mnc-dev
Doris Liu [Thu, 28 May 2015 22:34:57 +0000 (22:34 +0000)]
am
7b554a8f: am
057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev
* commit '
7b554a8f1513c1737a9326b7e99b83fe5aab53f0':
Fix ScrollView's EdgeEffect to respect clipToPadding flag
Guang Zhu [Thu, 28 May 2015 22:34:51 +0000 (22:34 +0000)]
am
0ea60834: am
6ac0c8c5: lock device orientation during app compatibility test
* commit '
0ea60834f7dac863ead8710e92ca11003974775b':
lock device orientation during app compatibility test
Bryce Lee [Thu, 28 May 2015 22:34:43 +0000 (22:34 +0000)]
am
fc2cb155: am
3aeb5f84: am
2836b863: am
f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '
fc2cb1551e397c041551f648f44f32cdaca8f089':
Introduce indirection for base micro themes.
Adam Lesinski [Thu, 28 May 2015 22:34:37 +0000 (22:34 +0000)]
am
e87126e8: am
8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
* commit '
e87126e8915785e1801580d44ea181304bbfa701':
BatteryStats: Output per-app wifi controller distribution
David Friedman [Thu, 28 May 2015 22:34:18 +0000 (22:34 +0000)]
am
2da36fb3: am
e9ac8174: am
dd6ccfd0: am
8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
* commit '
2da36fb340359c113db532796ed33799503680d8':
Docs: Quick typo fix.
Luan Nguyen [Thu, 28 May 2015 22:34:12 +0000 (22:34 +0000)]
am
1532af39: am
dd054f50: am
15afeaa9: am
2429cc41: docs: Fix bad heading link for doze-standby
* commit '
1532af398059b21c1e38d1012c3f76ad084ffe48':
docs: Fix bad heading link for doze-standby
Chris Craik [Thu, 28 May 2015 22:33:40 +0000 (15:33 -0700)]
Fix build
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
Alan Viverette [Thu, 28 May 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Fix drawable CTS breakages" into mnc-dev
David Friedman [Thu, 28 May 2015 22:33:22 +0000 (22:33 +0000)]
am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
92451a97271d014ab10ca4685beae728d53601b4':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
David Friedman [Thu, 28 May 2015 22:16:19 +0000 (22:16 +0000)]
Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 22:09:15 +0000 (22:09 +0000)]
am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
ed8c62955aa6512fb4e929e59893c774ae894358':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Chris Craik [Thu, 28 May 2015 22:08:39 +0000 (22:08 +0000)]
am
1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
* commit '
1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff':
Use path intersection instead of saveLayer+mesh to mask projected ripples
Deepanshu Gupta [Thu, 28 May 2015 22:08:34 +0000 (22:08 +0000)]
am
5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
* commit '
5cd795a9094eb02c983751ecabca6f24b0a01c58':
Fix NPE in BridgeContext.obtainStyledAttributes()
Deepanshu Gupta [Thu, 28 May 2015 22:08:30 +0000 (22:08 +0000)]
am
1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev
* commit '
1421583bca78ed1d2e22d091d64ae72352c4a9f5':
Fix BridgeTypedArray.getType()
Chris Craik [Thu, 28 May 2015 22:03:06 +0000 (22:03 +0000)]
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
OSDN Git Service
