OSDN Git Service
Zhen Yu Song [Fri, 30 Jan 2015 00:28:18 +0000 (16:28 -0800)]
+ Update api file.
Change-Id: I1a2abb974c6a789c3533a44d3ceb70cf6701b9f9
Zhen Yu Song [Fri, 14 Nov 2014 23:34:39 +0000 (15:34 -0800)]
+ Add CarExtender to Notification
Bug:
18316420
Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
Christopher Tate [Wed, 28 Jan 2015 01:49:56 +0000 (01:49 +0000)]
am
46e657bd: am
26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
automerge:
134aedd
* commit '
134aedd2c9bce194a5c826fe7a9a7389edd8bcad':
Enforce backup encryption in the UI, not just in effect
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:38:08 +0000 (01:38 +0000)]
am
0c607b97: am
f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
automerge:
ff1876d
* commit '
ff1876d1fb8dfcaba61d3fc7de296d663a4e160e':
Fix 'always' preferred app assignment
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
Chris Craik [Wed, 28 Jan 2015 01:14:41 +0000 (01:14 +0000)]
Merge "Move scissor state to RenderState"
Christopher Tate [Wed, 28 Jan 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev
Chris Craik [Tue, 27 Jan 2015 02:06:29 +0000 (18:06 -0800)]
Move scissor state to RenderState
Change-Id: I1227a3886fb24e4d9fad79fca469794f06cfb15e
Alan Viverette [Wed, 28 Jan 2015 01:01:04 +0000 (17:01 -0800)]
Update system-current to fix build
Change-Id: Ib8e092cf5097def96eebf85179e6daa683cd717e
Tim Kilbourn [Wed, 28 Jan 2015 00:29:28 +0000 (00:29 +0000)]
am
a8a4ce97: am
597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
automerge:
0048355
* commit '
00483559b3f5fbdb6bc28ac617fbc0eaea2aa503':
Add a config for whether to start in touch mode.
Jeff Davidson [Wed, 28 Jan 2015 00:26:03 +0000 (00:26 +0000)]
Merge "resolved conflicts for merge of
b9470f3a to master"
Jeff Davidson [Wed, 28 Jan 2015 00:24:32 +0000 (16:24 -0800)]
resolved conflicts for merge of
b9470f3a to master
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
Alan Viverette [Wed, 28 Jan 2015 00:22:02 +0000 (00:22 +0000)]
Merge "Fix fallout from merging
e5743753 conflicts"
Alan Viverette [Wed, 28 Jan 2015 00:21:25 +0000 (16:21 -0800)]
Fix fallout from merging
e5743753 conflicts
Change-Id: Iad16381bdf925a05e2ec609c3a5442c2a0354be9
Alan Viverette [Wed, 28 Jan 2015 00:02:20 +0000 (00:02 +0000)]
Merge "Expose View.OnScrollChangeListener interface"
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
Ricardo Cervera [Tue, 27 Jan 2015 23:44:52 +0000 (23:44 +0000)]
am
8ff85c5e: am
be3731f0: am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
automerge:
3c6cd62
* commit '
3c6cd6273ce89598c10cc15aa2843a7f8301ff27':
docs: Transitions training class.
Craig Mautner [Tue, 27 Jan 2015 23:43:26 +0000 (23:43 +0000)]
am
604a9e28: am
5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
automerge:
bf6af73
* commit '
bf6af73de6b24e53e9656da75b542d2f8caa77e6':
Defer tap outside stack until multiwindows
Jason Sams [Tue, 27 Jan 2015 23:41:56 +0000 (23:41 +0000)]
am
02236295: am
4dd0cf42: Merge "Initialize clipping structure"
automerge:
45e6c8b
* commit '
45e6c8b31253d864d55c9835c76180a9b3d5bd59':
Initialize clipping structure
Marco Nelissen [Tue, 27 Jan 2015 23:40:39 +0000 (23:40 +0000)]
am
3ea395dd: am
4e853598: Merge "Fix printf format"
automerge:
2c2415a
* commit '
2c2415a552b62016886af62419080ca7ac327871':
Fix printf format
Alan Viverette [Tue, 27 Jan 2015 23:38:19 +0000 (15:38 -0800)]
Expose View.OnScrollChangeListener interface
Allows clients to observe changes to scrollX / scrollY.
Bug:
19098033
Change-Id: I070e61a9532fe1f6cb5437eab94f7fffc1b17e97
Mike Lockwood [Tue, 27 Jan 2015 23:35:44 +0000 (23:35 +0000)]
Merge "AndroidManifest.xml: Remove two obsolete protected broadcasts"
Leon Scroggins III [Tue, 27 Jan 2015 23:34:35 +0000 (23:34 +0000)]
am
3523e4fc: am
efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
automerge:
8475144
* commit '
847514499f5920d073f5cd402dd0d3bbd19ac2c1':
Handle bad ninepatch data.
Marco Nelissen [Tue, 27 Jan 2015 23:33:05 +0000 (23:33 +0000)]
am
99985d98: am
e74da38e: Merge "Make SoundPool use MediaCodec"
automerge:
6e14c57
* commit '
6e14c5705c5acf9d6036060252f257a084cd7578':
Make SoundPool use MediaCodec
Matthew Xie [Tue, 27 Jan 2015 23:31:32 +0000 (23:31 +0000)]
am
46c3304a: am
485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
automerge:
e213c68
* commit '
e213c6813e5abe51d1359bacc1ae5f0ca5367505':
Delay the second message for 30ms more than the last message for a2dp
George Mount [Tue, 27 Jan 2015 23:30:18 +0000 (23:30 +0000)]
am
fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge:
aa6945a
automerge:
5c25f5b
* commit '
5c25f5b0a7de7c05e71a88373223d579c3823415':
Activity Transition: fix quick back after enter.
Lorenzo Colitti [Tue, 27 Jan 2015 23:29:02 +0000 (23:29 +0000)]
am
b84e0040: am
525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
automerge:
9461526
* commit '
94615260a8fc51fc6b9a0407b1caa13849082af5':
Make NetworkMonitor less aggressive on broken networks.
Yabin Cui [Tue, 27 Jan 2015 23:27:37 +0000 (23:27 +0000)]
am
f7049289: am
3812e68e: Merge "kill HAVE_PTHREADS."
automerge:
3a10a67
* commit '
3a10a672f05735be46256617b8a61cdb1e589008':
kill HAVE_PTHREADS.
Svetoslav [Tue, 27 Jan 2015 23:26:24 +0000 (23:26 +0000)]
am
fcecdccc: am
369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
automerge:
3fd1ebf
* commit '
3fd1ebff6c017ba4495070cb34f1ed7652b33cc9':
Add a missing file to print spooler resources
Alan Viverette [Tue, 27 Jan 2015 23:23:09 +0000 (15:23 -0800)]
resolve merge conflicts of
e5743753 to master.
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
Mike Lockwood [Tue, 27 Jan 2015 20:06:44 +0000 (12:06 -0800)]
AndroidManifest.xml: Remove two obsolete protected broadcasts
android.media.action.USB_AUDIO_ACCESSORY_PLUG and android.media.action.USB_AUDIO_DEVICE_PLUG
were removed in a previous change.
Change-Id: I22d09b9a0eb4f6f29a31a50ed8bfa7e09c52b064
Wale Ogunwale [Tue, 27 Jan 2015 22:24:14 +0000 (22:24 +0000)]
Merge "Support activities in the same process having different resources."
Craig Mautner [Tue, 27 Jan 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Precompute FLAG_ACTIVITY_NO_ANIMATION"
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.
Craig Mautner [Tue, 27 Jan 2015 22:15:18 +0000 (22:15 +0000)]
Merge "Eliminate groupId and add task to AppWindowToken"
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.
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
Craig Mautner [Tue, 27 Jan 2015 02:03:13 +0000 (18:03 -0800)]
Precompute FLAG_ACTIVITY_NO_ANIMATION
Save lots of passing around of ActivityRecords when all you care
about is the flag.
Fixes bug
18088522 item #14
Change-Id: Ib6d95ef06b44faa1715a196ab710f96ed4517213
Craig Mautner [Mon, 26 Jan 2015 22:43:30 +0000 (14:43 -0800)]
Eliminate groupId and add task to AppWindowToken
Simplifies access by eliminating indirect referencing.
Fixes bug
18088522 item #15.
Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
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.
Alan Viverette [Tue, 27 Jan 2015 21:35:14 +0000 (13:35 -0800)]
Fix build
Change-Id: I134e40dbabcb9b111b3d7851a7adc247f5c92e3b
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 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
Alan Viverette [Tue, 27 Jan 2015 18:22:06 +0000 (18:22 +0000)]
Merge "resolve merge conflicts of
da9653a2 to "
Alan Viverette [Tue, 27 Jan 2015 18:21:06 +0000 (10:21 -0800)]
resolve merge conflicts of
da9653a2 to master.
Change-Id: Ic77174eb047e2a925e5feedf032e1f26f892ad61
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
Jose Lima [Tue, 27 Jan 2015 17:57:04 +0000 (17:57 +0000)]
am
445768bd: am
3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
automerge:
69fbcf1
* commit '
69fbcf1f100905f5a28909d561db4753189bd717':
Allow disabling the Options Pannel feature for TVs
Craig Mautner [Tue, 27 Jan 2015 17:55:31 +0000 (17:55 +0000)]
am
603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge:
49880ee
automerge:
8e72aa8
* commit '
8e72aa8a41cf1395ce30a9f0c9416587d64b5ba9':
Stop logging service starts and stops.
Wonsik Kim [Tue, 27 Jan 2015 17:54:20 +0000 (17:54 +0000)]
am
b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge:
cd8a80c
automerge:
ae3e5e8
* commit '
ae3e5e82b6d36aa49cd9da7d89f6943fe92b1d41':
TIF: fix loud volume after input switch when volume is 0
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
Chris Craik [Tue, 27 Jan 2015 17:53:00 +0000 (17:53 +0000)]
am
00c53d66: am
cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
automerge:
2da67b5
* commit '
2da67b570c91a831550fee32f778e2a60055e0d8':
Invalidate outline on padding update
Alan Viverette [Tue, 27 Jan 2015 17:50:21 +0000 (17:50 +0000)]
Merge "resolve merge conflicts of
da9653a to "
Marco Nelissen [Tue, 27 Jan 2015 17:49:01 +0000 (17:49 +0000)]
Merge "Make SoundPool use MediaCodec"
Alan Viverette [Tue, 27 Jan 2015 17:48:47 +0000 (09:48 -0800)]
resolve merge conflicts of
da9653a to master.
Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1
Jorim Jaggi [Wed, 7 Jan 2015 20:28:58 +0000 (21:28 +0100)]
Remove dead code #11: Remove more unused classes
Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
Jorim Jaggi [Tue, 27 Jan 2015 16:53:01 +0000 (16:53 +0000)]
Merge "Revert "Remove dead code #11: Remove more unused classes""
Jorim Jaggi [Tue, 27 Jan 2015 16:52:24 +0000 (16:52 +0000)]
Revert "Remove dead code #11: Remove more unused classes"
This reverts commit
397ca8be8de407237cd293873647c182837bc032.
Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1
Reason: Build breakage.
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
Jorim Jaggi [Tue, 27 Jan 2015 16:12:23 +0000 (16:12 +0000)]
Merge "Remove dead code #11: Remove more unused classes"
Wale Ogunwale [Sat, 24 Jan 2015 00:05:07 +0000 (16:05 -0800)]
Support activities in the same process having different resources.
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.
Bug:
19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
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.
George Mount [Tue, 27 Jan 2015 15:15:38 +0000 (15:15 +0000)]
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
automerge:
aa6945a
* commit '
aa6945ac7904611499ae4ad33799d1f1fe434d32':
Activity Transition: fix quick back after enter.
George Mount [Tue, 27 Jan 2015 15:13:29 +0000 (15:13 +0000)]
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
Lorenzo Colitti [Tue, 27 Jan 2015 11:55:51 +0000 (11:55 +0000)]
am
b84e0040: am
525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
* commit '
b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
Make NetworkMonitor less aggressive on broken networks.
Lorenzo Colitti [Tue, 27 Jan 2015 11:46:31 +0000 (11:46 +0000)]
am
525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
* commit '
525588c593794cf52d93665e9cf55f06abd3d1b7':
Make NetworkMonitor less aggressive on broken networks.
Lorenzo Colitti [Tue, 27 Jan 2015 11:41:08 +0000 (11:41 +0000)]
Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
Yabin Cui [Tue, 27 Jan 2015 07:04:55 +0000 (07:04 +0000)]
am
f7049289: am
3812e68e: Merge "kill HAVE_PTHREADS."
* commit '
f70492898b3efa3c5f480f195062fa6f293bc764':
kill HAVE_PTHREADS.
Yabin Cui [Tue, 27 Jan 2015 06:54:06 +0000 (06:54 +0000)]
am
3812e68e: Merge "kill HAVE_PTHREADS."
* commit '
3812e68ea788782c54c27f69d08bcc1419066cb2':
kill HAVE_PTHREADS.
Yabin Cui [Tue, 27 Jan 2015 06:49:16 +0000 (06:49 +0000)]
Merge "kill HAVE_PTHREADS."
Yabin Cui [Tue, 27 Jan 2015 03:43:58 +0000 (19:43 -0800)]
kill HAVE_PTHREADS.
Bug:
19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
Svetoslav [Tue, 27 Jan 2015 04:36:37 +0000 (04:36 +0000)]
am
fcecdccc: am
369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
* commit '
fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
Add a missing file to print spooler resources
OSDN Git Service
