OSDN Git Service
Dirk Dougherty [Thu, 29 Jan 2015 01:11:14 +0000 (01:11 +0000)]
am
820d5c52: am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language. automerge:
3f9d57d automerge:
e0b5a38
* commit '
820d5c52b7e65bffeb4291887f5a1011e7ce971e':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 01:01:32 +0000 (01:01 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language. automerge:
3f9d57d
automerge:
e0b5a38
* commit '
e0b5a3812269228070dabb792bc501ae435338bb':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:54:45 +0000 (00:54 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language.
automerge:
3f9d57d
* commit '
3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
Doc change: Update Ads terms language.
Jae Seo [Thu, 29 Jan 2015 00:46:25 +0000 (00:46 +0000)]
am
4b1e5814: am
71191442: TIF: Do not call session callbacks when the session is already released
* commit '
4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4':
TIF: Do not call session callbacks when the session is already released
Jae Seo [Thu, 29 Jan 2015 00:33:29 +0000 (00:33 +0000)]
am
71191442: TIF: Do not call session callbacks when the session is already released
* commit '
711914421896ad15ab3c944c3adc838ac67cf2a6':
TIF: Do not call session callbacks when the session is already released
Dirk Dougherty [Thu, 29 Jan 2015 00:30:37 +0000 (00:30 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language.
* commit '
8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:24:39 +0000 (00:24 +0000)]
am
49738792: Doc change: Update Ads terms language.
* commit '
497387928d53cca060c3f43b3a9f5c7834564333':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
Jae Seo [Wed, 28 Jan 2015 23:50:08 +0000 (15:50 -0800)]
TIF: Do not call session callbacks when the session is already released
Bug:
19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
Eino-Ville Talvala [Wed, 28 Jan 2015 23:29:23 +0000 (23:29 +0000)]
am
06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge:
a17ab21
* commit '
06b1014cf28431706d42219549170896bd581a29':
Camera2 legacy: Do not advertise NV21 support.
Eino-Ville Talvala [Wed, 28 Jan 2015 23:22:56 +0000 (23:22 +0000)]
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
automerge:
a17ab21
* commit '
a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
Camera2 legacy: Do not advertise NV21 support.
Eino-Ville Talvala [Wed, 28 Jan 2015 23:20:00 +0000 (23:20 +0000)]
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
xinhe [Wed, 28 Jan 2015 21:53:34 +0000 (21:53 +0000)]
am
93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge:
fc921d1
* commit '
93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 21:45:25 +0000 (21:45 +0000)]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
automerge:
fc921d1
* commit '
fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c':
Sprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 21:42:14 +0000 (21:42 +0000)]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
Jose Lima [Wed, 28 Jan 2015 21:27:33 +0000 (21:27 +0000)]
am
4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge:
1f81973
* commit '
4a40f7cc90d8f908527d2cfff32376ee51259250':
Fix crash caused by disabling the Options panel on TVs
Leon Scroggins III [Wed, 28 Jan 2015 21:27:15 +0000 (21:27 +0000)]
Jose Lima [Wed, 28 Jan 2015 20:59:05 +0000 (20:59 +0000)]
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
automerge:
1f81973
* commit '
1f81973e7d33f2a3f4b0a0e232854283f0f18030':
Fix crash caused by disabling the Options panel on TVs
Eino-Ville Talvala [Wed, 28 Jan 2015 20:55:12 +0000 (12:55 -0800)]
Camera2 legacy: Do not advertise NV21 support.
Also reduce logging somewhat for common scenarios.
Bug:
19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
Jose Lima [Wed, 28 Jan 2015 20:55:51 +0000 (20:55 +0000)]
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
Leon Scroggins III [Wed, 28 Jan 2015 19:13:55 +0000 (19:13 +0000)]
Leon Scroggins III [Wed, 28 Jan 2015 19:09:08 +0000 (19:09 +0000)]
Jose Lima [Wed, 28 Jan 2015 18:43:15 +0000 (10:43 -0800)]
Fix crash caused by disabling the Options panel on TVs
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug:
19178531
Bug:
18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
xinhe [Wed, 28 Jan 2015 18:40:27 +0000 (10:40 -0800)]
Sprint: MMS cannot be sent in the UK
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.
Bug:
18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
Leon Scroggins III [Wed, 28 Jan 2015 18:32:20 +0000 (18:32 +0000)]
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
Bryce Lee [Wed, 28 Jan 2015 17:58:41 +0000 (17:58 +0000)]
am
2a8ccd4b: am
1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '
2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
Revert "Make THEATER_MODE_ON setting a system api."
John Spurlock [Wed, 28 Jan 2015 17:58:35 +0000 (17:58 +0000)]
am
4b41400b: am
e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '
4b41400b60d57f23b16702540b9d50f98aeeffb7':
Default "pickup peforms proximity check" to false.
Bryce Lee [Wed, 28 Jan 2015 17:52:59 +0000 (17:52 +0000)]
am
1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '
1061652a37e18683c994f9d4b872ecf990125a05':
Revert "Make THEATER_MODE_ON setting a system api."
John Spurlock [Wed, 28 Jan 2015 17:52:48 +0000 (17:52 +0000)]
am
e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '
e2f4ab930fa4526cf989624356051b99008c23a6':
Default "pickup peforms proximity check" to false.
Bryce Lee [Wed, 28 Jan 2015 17:50:38 +0000 (17:50 +0000)]
Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
John Spurlock [Wed, 28 Jan 2015 17:48:12 +0000 (17:48 +0000)]
Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
Bryce Lee [Wed, 28 Jan 2015 17:45:35 +0000 (17:45 +0000)]
Revert "Make THEATER_MODE_ON setting a system api."
This reverts commit
35dafda1b0357eb0f2eef766427a2b473967a918.
Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
Leon Scroggins III [Wed, 28 Jan 2015 17:39:52 +0000 (17:39 +0000)]
am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
automerge:
1e0d4b5
* commit '
1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
Handle bad ninepatch data.
Bryce Lee [Wed, 28 Jan 2015 17:15:11 +0000 (17:15 +0000)]
am
fdb8dff5: am
d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit '
fdb8dff54cf9327089e5ee4d5bf461ef42020fcd':
Make THEATER_MODE_ON setting a system api.
Bryce Lee [Wed, 28 Jan 2015 17:09:21 +0000 (17:09 +0000)]
am
d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit '
d8cb404035e8e133e310f5d811d44e3b0ecb8dcf':
Make THEATER_MODE_ON setting a system api.
Bryce Lee [Wed, 28 Jan 2015 17:03:56 +0000 (17:03 +0000)]
Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
Geoff Mendal [Wed, 28 Jan 2015 15:36:25 +0000 (15:36 +0000)]
am
a4293a9b: (-s ours) am
7608492d: (-s ours) Import translations. DO NOT MERGE
* commit '
a4293a9b91a41c80e3af255da3cee22f6cb974d9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:26:16 +0000 (15:26 +0000)]
am
7608492d: (-s ours) Import translations. DO NOT MERGE
* commit '
7608492dea3e05e6c6ace5bceb17dceb512dbc6d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 14:21:29 +0000 (08:21 -0600)]
Import translations. DO NOT MERGE
Change-Id: I1c7abd76bf9a24b5e05058f17d1c64d9051b5f81
Auto-generated-cl: translation import
Joe Fernandez [Wed, 28 Jan 2015 04:30:47 +0000 (04:30 +0000)]
am
3961def5: am
f8afd564: am
c6326f44: am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge:
5421eee
* commit '
3961def5a917eff8afcb50aa4c718bd9cd4351a5':
docs: plugin for gradle typo
Leon Scroggins III [Wed, 28 Jan 2015 04:30:42 +0000 (04:30 +0000)]
am
ca4aee06: am
1fa564ef: am
cae216f8: am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data. automerge:
714b651
* commit '
ca4aee06ccf3bb92c4c1ad9c554186dbf5f9f095':
Handle bad ninepatch data.
Joe Fernandez [Wed, 28 Jan 2015 04:21:13 +0000 (04:21 +0000)]
am
f8afd564: am
c6326f44: am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge:
5421eee
* commit '
f8afd564066f95dd724c9de499ee9acabf45787d':
docs: plugin for gradle typo
Leon Scroggins III [Wed, 28 Jan 2015 04:21:09 +0000 (04:21 +0000)]
am
1fa564ef: am
cae216f8: am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data. automerge:
714b651
* commit '
1fa564ef54787287a3fdfe6ee97d4a0295f0d8c7':
Handle bad ninepatch data.
Joe Fernandez [Wed, 28 Jan 2015 04:14:54 +0000 (04:14 +0000)]
am
c6326f44: am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
automerge:
5421eee
* commit '
5421eee195265d05c821814501aae1bf3f468661':
docs: plugin for gradle typo
Leon Scroggins III [Wed, 28 Jan 2015 04:13:25 +0000 (04:13 +0000)]
am
cae216f8: am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
automerge:
714b651
* commit '
714b6517dcca03a1a6496b33064d54a6b781914a':
Handle bad ninepatch data.
Christopher Tate [Wed, 28 Jan 2015 01:47:53 +0000 (01:47 +0000)]
am
46e657bd: am
26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
* commit '
46e657bdbc4323fcab14882f87ece86bc8838892':
Enforce backup encryption in the UI, not just in effect
Christopher Tate [Wed, 28 Jan 2015 01:36:33 +0000 (01:36 +0000)]
am
26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
* commit '
26faa0be670484b3f32b9e4b07533c3fbef540f5':
Enforce backup encryption in the UI, not just in effect
Christopher Tate [Wed, 28 Jan 2015 01:35:58 +0000 (01:35 +0000)]
am
0c607b97: am
f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
* commit '
0c607b97f068ca486036a501052572e9207c0926':
Fix 'always' preferred app assignment
Christopher Tate [Wed, 28 Jan 2015 01:23:49 +0000 (01:23 +0000)]
Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
Christopher Tate [Wed, 28 Jan 2015 01:20:44 +0000 (01:20 +0000)]
am
f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
* commit '
f37b20e1aa03fe662e7cef8e6aee2ded9ea5e514':
Fix 'always' preferred app assignment
Christopher Tate [Wed, 28 Jan 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev
Christopher Tate [Tue, 27 Jan 2015 23:33:40 +0000 (15:33 -0800)]
Enforce backup encryption in the UI, not just in effect
Encryption is required when using 'adb backup' on encrypted devices,
but the UI has not been enforcing this. The failure mode is quite
confusing: the user can tap "back up my data" with no encryption
phrase supplied, and the confirmation activity disappears, but
the backup doesn't actually happen.
We now disallow confirming the backup unless a non-empty passphrase
has been entered into the UI.
In addition, tapping "do not back up my data" now finishes
the confirmation activity instead of just leaving it in a
confusing "dead" state.
Bug
19081192
Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0
Joe Fernandez [Tue, 27 Jan 2015 23:09:12 +0000 (23:09 +0000)]
am
c6326f44: am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
* commit '
c6326f44bf0634f58a7bf6f322b4b676352baeed':
docs: plugin for gradle typo
Joe Fernandez [Tue, 27 Jan 2015 23:03:49 +0000 (23:03 +0000)]
am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
* commit '
05defb992eefb8a32742d64c06e8e8fd02dbf670':
docs: plugin for gradle typo
Leon Scroggins III [Tue, 27 Jan 2015 23:02:57 +0000 (23:02 +0000)]
am
cae216f8: am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
cae216f8dc3e1d752f2c353e488da07cadd95570':
Handle bad ninepatch data.
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs
Leon Scroggins III [Tue, 27 Jan 2015 22:55:00 +0000 (22:55 +0000)]
am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
1dbbc2045ae16a4923b30c9576703d02a4363529':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
6106f6a490cb5816602e8e3ae84a5c653dda44d3':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
9352296810926eae663477526545a55e1b1f7a27':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
01287549ad415c51377683696eb37c362d43061a':
Handle bad ninepatch data.
Tim Kilbourn [Tue, 27 Jan 2015 22:15:42 +0000 (22:15 +0000)]
am
a8a4ce97: am
597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
* commit '
a8a4ce97b3dd901d047a436943e9f80e0e8be820':
Add a config for whether to start in touch mode.
Tim Kilbourn [Tue, 27 Jan 2015 22:09:21 +0000 (22:09 +0000)]
am
597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
* commit '
597bb6968be56c1b8b0629ba89fec409084cc112':
Add a config for whether to start in touch mode.
Jeff Davidson [Tue, 27 Jan 2015 22:09:08 +0000 (22:09 +0000)]
am
9490c597: am
bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
* commit '
9490c597460a2fcaaf0d510576f4f752b7a725ce':
Use consistent logic for data icon overlays.
Tim Kilbourn [Tue, 27 Jan 2015 22:03:49 +0000 (22:03 +0000)]
Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
Jeff Davidson [Tue, 27 Jan 2015 22:03:24 +0000 (22:03 +0000)]
am
bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
* commit '
bae051f6bd8ae4f103d8067ed96accbced173664':
Use consistent logic for data icon overlays.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am
9a6143fa: Handle bad ninepatch data.
* commit '
9a6143fab7d93797e4b22a12b89e07c160e5c31d':
Handle bad ninepatch data.
Jeff Davidson [Tue, 27 Jan 2015 21:57:05 +0000 (21:57 +0000)]
Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
Christopher Tate [Tue, 27 Jan 2015 21:47:51 +0000 (13:47 -0800)]
Fix 'always' preferred app assignment
In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken. We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.
Bug
19011225
Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c
Tim Kilbourn [Wed, 21 Jan 2015 23:43:07 +0000 (15:43 -0800)]
Add a config for whether to start in touch mode.
Bug:
18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
Ricardo Cervera [Tue, 27 Jan 2015 21:43:26 +0000 (21:43 +0000)]
am
8ff85c5e: am
be3731f0: am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
8ff85c5ecb09f297d8926bae5ad09f0423594ed0':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:34:45 +0000 (21:34 +0000)]
am
be3731f0: am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
be3731f028cf815d51e7c49b7415d7d1e8ac3639':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:28:14 +0000 (21:28 +0000)]
am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
f5386a9a949297be1321cce7eed5d0975c7b64ad':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:23:19 +0000 (21:23 +0000)]
am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am
de113066: docs: Transitions training class.
* commit '
de113066d80c3f19979eb531484af73f64640de9':
docs: Transitions training class.
Craig Mautner [Tue, 27 Jan 2015 21:00:29 +0000 (21:00 +0000)]
am
604a9e28: am
5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
* commit '
604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
Defer tap outside stack until multiwindows
Craig Mautner [Tue, 27 Jan 2015 20:54:42 +0000 (20:54 +0000)]
am
5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
* commit '
5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
Defer tap outside stack until multiwindows
Jason Sams [Tue, 27 Jan 2015 20:54:08 +0000 (20:54 +0000)]
am
02236295: am
4dd0cf42: Merge "Initialize clipping structure"
* commit '
02236295a43380b21e4cae10b13da3398d607627':
Initialize clipping structure
Craig Mautner [Tue, 27 Jan 2015 20:48:55 +0000 (20:48 +0000)]
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
Jason Sams [Tue, 27 Jan 2015 20:48:04 +0000 (20:48 +0000)]
am
4dd0cf42: Merge "Initialize clipping structure"
* commit '
4dd0cf42f5941d9e25aa042bf75fa003b1f5ec76':
Initialize clipping structure
Jason Sams [Tue, 27 Jan 2015 20:41:42 +0000 (20:41 +0000)]
Merge "Initialize clipping structure"
Marco Nelissen [Tue, 27 Jan 2015 20:33:09 +0000 (20:33 +0000)]
am
3ea395dd: am
4e853598: Merge "Fix printf format"
* commit '
3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
Fix printf format
Marco Nelissen [Tue, 27 Jan 2015 20:25:59 +0000 (20:25 +0000)]
am
4e853598: Merge "Fix printf format"
* commit '
4e85359879cb417f0540a5cfbf91242ebd9546c7':
Fix printf format
Marco Nelissen [Tue, 27 Jan 2015 20:19:46 +0000 (20:19 +0000)]
Merge "Fix printf format"
Marco Nelissen [Tue, 27 Jan 2015 20:17:48 +0000 (12:17 -0800)]
Fix printf format
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
Craig Mautner [Tue, 27 Jan 2015 19:44:59 +0000 (11:44 -0800)]
Defer tap outside stack until multiwindows
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.
Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.
Fixes bug
17721767.
Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.
Changes proposed by Ben Hawkes of Google Project Zero.
NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.
ResourceTypes.h:
Store ninepatch values as unsigned.
BUG:
19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit
a730ef3f77fc495bc90199b4d45efab26d609782)
Leon Scroggins III [Tue, 27 Jan 2015 18:33:46 +0000 (18:33 +0000)]
am
3523e4fc: am
efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
* commit '
3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57':
Handle bad ninepatch data.
Marco Nelissen [Tue, 27 Jan 2015 18:28:53 +0000 (18:28 +0000)]
am
99985d98: am
e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '
99985d98c23b32acc0014031d7b88ee4eed21a4b':
Make SoundPool use MediaCodec
Leon Scroggins III [Tue, 27 Jan 2015 18:27:18 +0000 (18:27 +0000)]
am
efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
* commit '
efe085ffbd97b6f9d1460a9642084a6d3be11797':
Handle bad ninepatch data.
Matthew Xie [Tue, 27 Jan 2015 18:22:57 +0000 (18:22 +0000)]
am
46c3304a: am
485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
* commit '
46c3304aed2cabb592e499b0b3de56a312e1d67f':
Delay the second message for 30ms more than the last message for a2dp
Leon Scroggins III [Tue, 27 Jan 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Handle bad ninepatch data." into lmp-mr1-dev
Matthew Xie [Tue, 27 Jan 2015 18:17:00 +0000 (18:17 +0000)]
am
485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
* commit '
485813a00cfd857fadab30c67cab985835857801':
Delay the second message for 30ms more than the last message for a2dp
Matthew Xie [Tue, 27 Jan 2015 18:13:39 +0000 (18:13 +0000)]
Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
Marco Nelissen [Tue, 27 Jan 2015 17:53:03 +0000 (17:53 +0000)]
am
e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '
e74da38e21a320528d0c94d076e59bd503c37623':
Make SoundPool use MediaCodec
Marco Nelissen [Tue, 27 Jan 2015 17:49:01 +0000 (17:49 +0000)]
Merge "Make SoundPool use MediaCodec"
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.
Changes proposed by Ben Hawkes of Google Project Zero.
NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.
ResourceTypes.h:
Store ninepatch values as unsigned.
BUG:
19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
George Mount [Tue, 27 Jan 2015 15:21:23 +0000 (15:21 +0000)]
am
fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge:
aa6945a
* commit '
fff84a232a964a8587eabee4e34cc38344309593':
Activity Transition: fix quick back after enter.
OSDN Git Service
