OSDN Git Service
Geoff Mendal [Wed, 11 Mar 2015 14:33:53 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I217bbbfd12e4a19163c37fb7035f61628a67423d
Auto-generated-cl: translation import
Mike Lockwood [Wed, 11 Mar 2015 10:55:41 +0000 (10:55 +0000)]
Merge "Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()"
Mike Lockwood [Mon, 9 Mar 2015 22:03:11 +0000 (15:03 -0700)]
Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()
Change-Id: I10d4f5e2400fcaf41f455e56ca25bbc0c781a042
Alan Treadway [Wed, 11 Mar 2015 09:42:51 +0000 (09:42 +0000)]
Merge "Fix for managed-profile users needing to "install" packages twice."
Tor Norbye [Wed, 11 Mar 2015 03:43:12 +0000 (03:43 +0000)]
Merge "Fix @ColorInt javadoc"
Guang Zhu [Wed, 11 Mar 2015 02:15:23 +0000 (19:15 -0700)]
Fix build
Change-Id: I530793e9090d780a5cb2581ee185badc51e14902
Tor Norbye [Wed, 11 Mar 2015 02:14:03 +0000 (19:14 -0700)]
Fix @ColorInt javadoc
Change-Id: Icea3a3b4013b4a6b5f9809eec082ea93bc26b079
Vishwath Mohan [Wed, 11 Mar 2015 00:41:37 +0000 (00:41 +0000)]
Merge "Prevent integer overflow in ResourceTypes"
Wale Ogunwale [Wed, 11 Mar 2015 00:31:32 +0000 (00:31 +0000)]
Merge "Converted some AMS log points to use ActivityManagerDebugConfig."
Rich Slogar [Wed, 11 Mar 2015 00:24:10 +0000 (00:24 +0000)]
am
e7b3834e: am
1d0b0edd: am
ccc24997: am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
e7b3834e23a53f330cb866a5b02674034f161977':
docs: build tools revision 22.0.0:
Narayan Kamath [Wed, 11 Mar 2015 00:23:35 +0000 (00:23 +0000)]
am
debf5a09: am
c2826fb9: am
3d333c74: Merge "Fix typos in AudioManager javadoc"
* commit '
debf5a09e46027f29c26b6502d4aa6508dd3e4b5':
Fix typos in AudioManager javadoc
Dmitriy Ivanov [Wed, 11 Mar 2015 00:23:26 +0000 (00:23 +0000)]
am
1944667b: am
8ced0357: am
2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '
1944667b7f70c336da66cc3fbdee3a2fbd766980':
Generate sysv hash for libjnigraphics
Andreas Gampe [Wed, 11 Mar 2015 00:19:26 +0000 (00:19 +0000)]
Merge "resolved conflicts for merge of
b6d6c04a to master"
Adrian Roos [Wed, 11 Mar 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Notify TrustAgentService when device policy configuration no longer applies"
Wale Ogunwale [Fri, 6 Mar 2015 23:39:44 +0000 (15:39 -0800)]
Converted some AMS log points to use ActivityManagerDebugConfig.
Change-Id: I0563bafd29ae0bbe596ed8c06fcc573b5ead50b7
Svetoslav [Tue, 10 Mar 2015 23:54:20 +0000 (23:54 +0000)]
Merge "Make settings XML files readable"
Svetoslav [Tue, 10 Mar 2015 23:53:35 +0000 (16:53 -0700)]
Make settings XML files readable
Change-Id: I320f5419e045d257dc5ccbf81a9434f9b9d38564
Paul McLean [Tue, 10 Mar 2015 22:47:30 +0000 (22:47 +0000)]
Merge "Handle simultaneous connect of devices with the same "type" (as in USB)"
Ricky Wai [Tue, 10 Mar 2015 22:46:20 +0000 (22:46 +0000)]
Merge "Add Phone.ENTERPRISE_CONTENT_URI"
Andreas Gampe [Tue, 10 Mar 2015 22:36:20 +0000 (15:36 -0700)]
resolved conflicts for merge of
b6d6c04a to master
Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
Chris Craik [Tue, 10 Mar 2015 22:40:14 +0000 (22:40 +0000)]
Merge "Track down unsupported texture target"
Wale Ogunwale [Tue, 10 Mar 2015 22:36:40 +0000 (22:36 +0000)]
Merge "Revert "Remove activity and window stacks when last task is removed.""
Craig Mautner [Tue, 10 Mar 2015 22:08:15 +0000 (22:08 +0000)]
Merge "Correct docs to specify leading slash in paths."
Wale Ogunwale [Tue, 10 Mar 2015 21:55:31 +0000 (14:55 -0700)]
Revert "Remove activity and window stacks when last task is removed."
This reverts commit
0f95e3f0753508344b198c0a76afb892df514f52.
Bug:
19644506
Bug:
19083170
Change-Id: I2eb2a0400be58fe2c5d48a4b68368725e98aaf6f
Chris Craik [Tue, 10 Mar 2015 22:02:23 +0000 (22:02 +0000)]
Merge "Add several CallSupers to View"
Paul McLean [Tue, 3 Mar 2015 17:29:19 +0000 (10:29 -0700)]
Handle simultaneous connect of devices with the same "type" (as in USB)
Change-Id: I163bf8e33ccf5aacc7ba21775916727430327f18
Bug:
19563570
Chris Craik [Tue, 10 Mar 2015 18:03:39 +0000 (11:03 -0700)]
Track down unsupported texture target
bug:
19641517
Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
John Spurlock [Tue, 10 Mar 2015 20:11:11 +0000 (20:11 +0000)]
Merge "ZenLog: Track changes to effect suppressorship."
Svetoslav [Thu, 19 Feb 2015 03:16:25 +0000 (19:16 -0800)]
Remove unused settings constants from the SDK (framework).
The settings constants for various volumes do nothing and are
used by nothing since API version 2. These are however backed
up in the cloud which is a waste of resource. This change
removes these constants from the SDK while keeping them hidden
to avoid breaking released apps and also prevents unnecessary
backup.
Change-Id: I2e91863115f5a4b997a14f8d0f57b4dc9689cfab
Vishwath Mohan [Tue, 10 Mar 2015 01:55:11 +0000 (18:55 -0700)]
Prevent integer overflow in ResourceTypes
Adds checks to 2 malloc() calls to ensure that the finally allocated
buffer size is not vulnerable to integer overflows. Also includes a
sanity check on the upper bound for type_info.numEntries before each
call.
Bug:
15171384
Change-Id: Ifdf0276bcca7e3d93da7c3577b9486d3c03a9d03
Robin Lee [Tue, 10 Mar 2015 18:30:24 +0000 (18:30 +0000)]
Merge "Move more file handling into LockSettingsStorage"
dcashman [Tue, 10 Mar 2015 18:15:54 +0000 (18:15 +0000)]
am
4c887ac9: am
db7fa51f: am
c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit '
4c887ac9318402b914dbee4462485006395bdfbe':
ZygoteConnection: remove obsolete security checks.
Rich Slogar [Tue, 10 Mar 2015 18:15:36 +0000 (18:15 +0000)]
am
502c30da: am
5427ac71: am
282099b5: am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
502c30da55d0bb6f2a51875558612fc50361c55f':
docs: android plugin for gradle release 1.1.3 release notes
Diego Perez [Tue, 10 Mar 2015 18:13:57 +0000 (18:13 +0000)]
Merge "Add support for the new native Builder class on StaticLayout."
John Spurlock [Tue, 10 Mar 2015 18:05:10 +0000 (18:05 +0000)]
Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes."
Alan Viverette [Tue, 10 Mar 2015 18:04:00 +0000 (18:04 +0000)]
Merge "Implement bounded ripple animation"
Sander Alewijnse [Tue, 10 Mar 2015 17:51:57 +0000 (17:51 +0000)]
Merge "Do not show toast when forwarding from resolver activity to itself."
Makoto Onuki [Tue, 10 Mar 2015 17:49:30 +0000 (17:49 +0000)]
Merge "Cache photo URI too in calllog (contract)"
Craig Mautner [Tue, 10 Mar 2015 17:47:07 +0000 (17:47 +0000)]
Merge "Revert "Revert "Add a timeout state to frozen windows"""
Craig Mautner [Tue, 10 Mar 2015 17:46:05 +0000 (17:46 +0000)]
Revert "Revert "Add a timeout state to frozen windows""
Insert correct bug id:
Fixes bug
15664090.
This reverts commit
1a07846d4d7f1665345a27da11d0f8d518b3b431.
Change-Id: Id5fd52acc47cb6f50485c14e75a448511d806ae4
Craig Mautner [Tue, 10 Mar 2015 17:44:40 +0000 (17:44 +0000)]
Merge "Revert "Add a timeout state to frozen windows""
Craig Mautner [Tue, 10 Mar 2015 17:44:11 +0000 (17:44 +0000)]
Revert "Add a timeout state to frozen windows"
Wrong bug listed on comment. Resubmitting with correct bug listed.
This reverts commit
a75e3e0b44e31ee5d042480d3da8d13cad56dc5a.
Change-Id: I49cb364c44763fd2d0c120d6998281d38571050b
James Cook [Tue, 10 Mar 2015 17:42:46 +0000 (17:42 +0000)]
Merge "Handle undo in TextView fields with no cursor"
Craig Mautner [Tue, 10 Mar 2015 17:41:52 +0000 (17:41 +0000)]
Merge "Add a timeout state to frozen windows"
James Cook [Tue, 10 Mar 2015 16:48:11 +0000 (09:48 -0700)]
Handle undo in TextView fields with no cursor
This fixes a rare crash in the undo system. In particular, if the
TextView did not have a cursor and the first operation was a
programmatic insert/append the "old cursor position" would be -1.
Attempting to undo would try to restore the cursor to -1 and crash.
Test will land separately in CTS.
Bug:
19332904
Change-Id: I9aa18c1e3621b99d13ac707e483154382effb81c
Alan Viverette [Tue, 10 Mar 2015 17:19:52 +0000 (17:19 +0000)]
Merge "Revert RelativeLayout's baseline view to API 22 and below behavior"
Elliott Hughes [Tue, 10 Mar 2015 17:15:41 +0000 (17:15 +0000)]
Merge "resolved conflicts for merge of
7545accf to master"
Elliott Hughes [Tue, 10 Mar 2015 17:14:42 +0000 (10:14 -0700)]
resolved conflicts for merge of
7545accf to master
Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
Chris Craik [Tue, 10 Mar 2015 17:12:55 +0000 (10:12 -0700)]
Add several CallSupers to View
Change-Id: I3011bd9757273f9c1d35f552bd6fefd4bf830029
John Spurlock [Tue, 10 Mar 2015 03:13:57 +0000 (23:13 -0400)]
MediaSession: Notify PlaybackInfo callbacks when playback type changes.
Bug:
19665979
Change-Id: I506a71330ca04a678027f5969638fd1685326b2d
Sander Alewijnse [Mon, 9 Mar 2015 15:31:10 +0000 (15:31 +0000)]
Do not show toast when forwarding from resolver activity to itself.
Bug:
19540802
Change-Id: I99409aab42bdbf187c07a345ca5c404e88a4c918
Chris Craik [Tue, 10 Mar 2015 16:29:12 +0000 (16:29 +0000)]
Merge "Glop based composeLayerRegion/Rect"
Chris Craik [Tue, 10 Mar 2015 16:29:00 +0000 (16:29 +0000)]
Merge "Rename and simplify DisplayList Canvas classes"
Robin Lee [Tue, 10 Mar 2015 12:34:28 +0000 (12:34 +0000)]
Move more file handling into LockSettingsStorage
Strengthens the guarantee of only one kind of lock type existing at one
time by clearing all of the relevant files out closer to time of write.
Change-Id: I141103dab5d7d4bc80b05a22b8566326d1c9e7e1
Rich Slogar [Tue, 10 Mar 2015 15:52:52 +0000 (15:52 +0000)]
am
1d0b0edd: am
ccc24997: am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
1d0b0edd303a0a6b15ec74f8036bd0e2e88be692':
docs: build tools revision 22.0.0:
Luan Nguyen [Tue, 10 Mar 2015 15:49:12 +0000 (15:49 +0000)]
am
b219eac8: am
a05634ff: am
408800c3: am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
b219eac8e827b034472cf885071b7e76ed6e4d60':
docs: Add new partners to Wear index page
Geoff Mendal [Tue, 10 Mar 2015 15:47:51 +0000 (15:47 +0000)]
am
c90aa638: (-s ours) am
535bf0f8: (-s ours) am
d7852b66: (-s ours) Import translations. DO NOT MERGE
* commit '
c90aa638f6465f383e40b2063d38496aab7b8914':
Import translations. DO NOT MERGE
Eric Gilmore [Tue, 10 Mar 2015 15:47:43 +0000 (15:47 +0000)]
am
89d0c0fb: am
bcea1fcd: am
f1eab6f5: am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b':
Reworking geofencing training to new API and sample.
Glenn Kasten [Tue, 10 Mar 2015 15:47:34 +0000 (15:47 +0000)]
Narayan Kamath [Tue, 10 Mar 2015 15:27:58 +0000 (15:27 +0000)]
am
c2826fb9: am
3d333c74: Merge "Fix typos in AudioManager javadoc"
* commit '
c2826fb922ba1626920907fa892cbc98e0db64a6':
Fix typos in AudioManager javadoc
Dmitriy Ivanov [Tue, 10 Mar 2015 15:27:51 +0000 (15:27 +0000)]
am
8ced0357: am
2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '
8ced0357152a9df64c9e21c8f3cec69cc7e8403d':
Generate sysv hash for libjnigraphics
Narayan Kamath [Tue, 10 Mar 2015 15:23:06 +0000 (15:23 +0000)]
am
3d333c74: Merge "Fix typos in AudioManager javadoc"
* commit '
3d333c745f928ca1595aca111d9938fa3cf3e282':
Fix typos in AudioManager javadoc
Dmitriy Ivanov [Tue, 10 Mar 2015 15:12:46 +0000 (15:12 +0000)]
am
2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '
2a88ff2fe1849a3823962a2c239afdf6339fedc9':
Generate sysv hash for libjnigraphics
Andreas Gampe [Tue, 10 Mar 2015 15:11:56 +0000 (15:11 +0000)]
am
174a4488: am
7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '
174a44888ec56f688426c80d50b9e0021f47c16f':
Frameworks/base: Pass APK debugability to installd
Narayan Kamath [Tue, 10 Mar 2015 15:10:14 +0000 (15:10 +0000)]
Merge "Fix typos in AudioManager javadoc"
Eemi Haukkala [Fri, 6 Mar 2015 21:03:30 +0000 (23:03 +0200)]
Fix typos in AudioManager javadoc
The ACTION_HDMI_AUDIO_PLUG constant's description
had spelled "HDMI" as "HMDI" and was missing a
period. Fixes issue 93726.
Change-Id: Idfd5352dba022afcd81bc9e50864fc6e95c661db
Signed-off-by: Eemi Haukkala <eemi.haukkala@gmail.com>
Rich Slogar [Tue, 10 Mar 2015 15:08:58 +0000 (15:08 +0000)]
am
ccc24997: am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
ccc24997a37a7ee96b80f4dc4f43ea52d2c2cd46':
docs: build tools revision 22.0.0:
Diego Perez [Mon, 9 Mar 2015 10:43:18 +0000 (10:43 +0000)]
Add support for the new native Builder class on StaticLayout.
This patch updates StaticLayout_Delegate to support the new Builder
class introduced in ag/646289.
Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
Rubin Xu [Tue, 10 Mar 2015 12:34:55 +0000 (12:34 +0000)]
Merge "Document behavior change of isUninstallBlocked() since L MR1"
Rubin Xu [Tue, 10 Mar 2015 10:51:59 +0000 (10:51 +0000)]
Document behavior change of isUninstallBlocked() since L MR1
Bug:
17914630
Change-Id: I39ee2775c104e4dca7ca583b83deef0aa0e4d1e3
Alan Treadway [Fri, 6 Mar 2015 14:27:36 +0000 (14:27 +0000)]
Fix for managed-profile users needing to "install" packages twice.
Fix ensures that the users requesting package installation have the
package marked as installed and enabled for them. This appears to be
the intent of the existing code, but without this change in certain
cases the user has to effectively request "installation" twice.
Bug:
17445378
Change-Id: Ic17399e493125e631b381b89615336be17c9d1ee
Dmitriy Ivanov [Tue, 10 Mar 2015 04:41:34 +0000 (04:41 +0000)]
Merge "Generate sysv hash for libjnigraphics"
Dmitriy Ivanov [Tue, 10 Mar 2015 02:42:16 +0000 (19:42 -0700)]
Generate sysv hash for libjnigraphics
Bug:
19059885
Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
Andreas Gampe [Tue, 10 Mar 2015 02:10:22 +0000 (02:10 +0000)]
am
7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '
7f383873566024c7121cadae3bbdd2a7c47150bc':
Frameworks/base: Pass APK debugability to installd
Chris Craik [Tue, 10 Mar 2015 01:50:14 +0000 (18:50 -0700)]
Rename and simplify DisplayList Canvas classes
Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
Mike Lockwood [Tue, 10 Mar 2015 02:02:59 +0000 (02:02 +0000)]
Merge "MIDI Manager changes:"
Alan Viverette [Tue, 3 Mar 2015 00:06:10 +0000 (16:06 -0800)]
Implement bounded ripple animation
Bug:
19431322
Change-Id: I5dc1a28d8675cc6fb036b815d6227113c3f1aa4b
Alan Viverette [Tue, 10 Mar 2015 01:51:57 +0000 (01:51 +0000)]
Merge "Refactor ripple components, simplify background animation"
Adam Lesinski [Tue, 10 Mar 2015 01:35:53 +0000 (01:35 +0000)]
Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers"
Rich Slogar [Tue, 10 Mar 2015 01:31:03 +0000 (01:31 +0000)]
am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
docs: build tools revision 22.0.0:
Alan Viverette [Tue, 10 Mar 2015 01:25:21 +0000 (18:25 -0700)]
Refactor ripple components, simplify background animation
Moves animation lifecycle and software/hardware hand-off into a unified
RippleComponent class, which makes it easier to maintain the components.
Adds better javadocs and comments to explain what's going on.
Bug:
19431322
Change-Id: Ifb9b9a7dcc24238719ef12293493ca3df107679f
Glenn Kasten [Tue, 10 Mar 2015 01:07:31 +0000 (01:07 +0000)]
Merge "Revert "soundpool: reuse channel for same sample if available""
Chris Craik [Mon, 9 Mar 2015 21:17:29 +0000 (14:17 -0700)]
Glop based composeLayerRegion/Rect
Change-Id: I69440cabca84948e8aaead9479d616ebc2496517
Glenn Kasten [Tue, 10 Mar 2015 01:06:28 +0000 (01:06 +0000)]
Merge "Revert "soundpool: update sample rate when reusing audiotrack""
Roozbeh Pournader [Tue, 10 Mar 2015 01:06:02 +0000 (01:06 +0000)]
Merge "Fix: Drag handles are not shown for selection/insertion"
Alan Viverette [Tue, 10 Mar 2015 01:01:19 +0000 (18:01 -0700)]
Revert RelativeLayout's baseline view to API 22 and below behavior
The previous behavior used the top-start-most view, rather than the view
with the bottom-most baseline. Which doesn't really make sense, but
that's what it did.
Bug:
19653790
Change-Id: Ia23476f1d2de5313fd82aac037e90d45b0af8972
Andy Hung [Tue, 10 Mar 2015 00:37:58 +0000 (00:37 +0000)]
Merge "Fix SoundPool playback of multichannel files."
Adam Lesinski [Mon, 9 Mar 2015 22:24:48 +0000 (15:24 -0700)]
BatteryStats: Record energy info stats from WiFi and Bluetooth controllers
Surface some of this information in BatteryStatsHelper. If we are given a
total energy from the WiFi controller, we normalize the computed
energy of each app and blame them for a fraction of the real energy.
Change-Id: I64051b600f5d9f6ac4580d56ef0977971eb4be2d
Alan Viverette [Tue, 10 Mar 2015 00:22:37 +0000 (00:22 +0000)]
Merge "Copy ViewPager and PagerAdapter into framework-internal widgets"
Eino-Ville Talvala [Tue, 10 Mar 2015 00:16:14 +0000 (00:16 +0000)]
Merge "Add DEPTH image formats, support in ImageReader"
Eric Laurent [Tue, 10 Mar 2015 00:06:10 +0000 (00:06 +0000)]
Merge "enable FM tuner and hotword capture for system apps."
Adrian Roos [Mon, 9 Mar 2015 23:53:55 +0000 (23:53 +0000)]
Merge "Add prototype of Inline Reply behind debug flag"
Rich Slogar [Mon, 9 Mar 2015 23:42:38 +0000 (23:42 +0000)]
Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 26 Feb 2015 18:57:55 +0000 (10:57 -0800)]
Add DEPTH image formats, support in ImageReader
- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats
Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:10 +0000 (23:29 +0000)]
Merge "Camera2: Add hidden depth stream configuration tags"
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:09 +0000 (23:29 +0000)]
Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream"
Alan Viverette [Mon, 9 Mar 2015 22:53:54 +0000 (22:53 +0000)]
Merge "Make TypedArray and LayoutInflater exceptions more useful"
Alan Viverette [Mon, 9 Mar 2015 22:51:10 +0000 (15:51 -0700)]
Copy ViewPager and PagerAdapter into framework-internal widgets
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.
Bug:
19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
Alan Viverette [Mon, 9 Mar 2015 22:32:50 +0000 (15:32 -0700)]
Make TypedArray and LayoutInflater exceptions more useful
Include unresolved TypedValue data in TypedArray exceptions, wrap all
LayoutInflater exceptions with the parser position.
Bug:
19658760
Change-Id: I8965bdc4d0c58c082cb7129c3b692a3e5418cfdb
Adam Lesinski [Mon, 9 Mar 2015 22:23:42 +0000 (15:23 -0700)]
Change WiFi and Bluetooth ActivityEnergyInfo classes
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.
Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073