OSDN Git Service
Jason Monk [Mon, 30 Mar 2015 19:54:00 +0000 (19:54 +0000)]
Merge "Add constant for manage permissions screen"
Wei Jia [Mon, 30 Mar 2015 19:39:37 +0000 (19:39 +0000)]
Merge "MediaPlayer: use local variable to check whether mTimeProvider is null."
John Reck [Mon, 30 Mar 2015 19:39:25 +0000 (19:39 +0000)]
Merge "Add GraphicsStatsService"
Alan Viverette [Mon, 30 Mar 2015 19:37:38 +0000 (19:37 +0000)]
Merge "Deprecate AnalogClock widget, Integer methods on TimePickerView"
Alan Viverette [Mon, 30 Mar 2015 19:36:29 +0000 (19:36 +0000)]
Merge "Fix ViewRootImpl handling of content changes, fix ViewPager parenting"
Winson Chung [Mon, 30 Mar 2015 19:34:27 +0000 (19:34 +0000)]
Merge "Prevent the dismiss icon from fading when multistack debugging is enabled."
Raph Levien [Mon, 30 Mar 2015 19:34:11 +0000 (19:34 +0000)]
Merge "Record hyphens from Minikin and draw them"
Winson Chung [Mon, 30 Mar 2015 19:32:29 +0000 (12:32 -0700)]
Prevent the dismiss icon from fading when multistack debugging is enabled.
Change-Id: I52db4222391cb7d922b9778cbc10a269451d10c5
Makoto Onuki [Mon, 30 Mar 2015 19:24:39 +0000 (19:24 +0000)]
Merge "Enterprise quick contact 1/2"
Skuhne [Mon, 30 Mar 2015 19:21:19 +0000 (19:21 +0000)]
Merge "Removing some tiling options for tablet usage"
Alan Viverette [Wed, 25 Mar 2015 20:09:20 +0000 (13:09 -0700)]
Fix ViewRootImpl handling of content changes, fix ViewPager parenting
Previously content changes were only handled if they came directly from
the focused host, which meant that changes that occurred higher in the
tree were ignored. As a result, scrolling in ViewPager that contained
virtual nodes would fail to update the focus position.
Change-Id: I028bd8c670f1210339da331626e1986c5b5d4b87
Alan Viverette [Wed, 25 Mar 2015 20:00:42 +0000 (13:00 -0700)]
Clean up date picker attributes, add carets
Bug:
19819283
Bug:
19431364
Change-Id: Idd66f4ceb99d598c0f256d85c43bff6e25ccdd8f
Skuhne [Mon, 30 Mar 2015 19:12:21 +0000 (12:12 -0700)]
Removing some tiling options for tablet usage
Bug:
19985265
Change-Id: I4e1dfb16222312b55115e23176223a839f156361
Jason Monk [Mon, 30 Mar 2015 14:38:48 +0000 (10:38 -0400)]
Add constant for manage permissions screen
This screen is not per app, but shows all runtime permissions and
how many apps hold each.
Change-Id: I68cdbe53177f742daf396f4eb53761fd5cda2636
Chris Wren [Mon, 30 Mar 2015 18:31:43 +0000 (18:31 +0000)]
Merge "add a mechanism for logging actions"
Chris Wren [Fri, 27 Mar 2015 14:06:00 +0000 (10:06 -0400)]
add a mechanism for logging actions
Change-Id: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Wei Jia [Mon, 30 Mar 2015 18:16:29 +0000 (11:16 -0700)]
MediaPlayer: use local variable to check whether mTimeProvider is null.
Bug:
18753807
Change-Id: I05ef22edea5d06b1efb1a01bf540404eb75ac954
Alan Viverette [Mon, 30 Mar 2015 17:27:01 +0000 (17:27 +0000)]
Merge "Clean up time picker attributes and drawing code"
Mike Lockwood [Mon, 30 Mar 2015 17:26:02 +0000 (17:26 +0000)]
Merge "Move MIDI utilities for internal use to com.android.internal.midi package"
Mike Lockwood [Mon, 30 Mar 2015 15:39:09 +0000 (08:39 -0700)]
Move MIDI utilities for internal use to com.android.internal.midi package
Change-Id: I7393ae1d4bca61667fb6ee809a7aa22c5c48de56
Geoff Mendal [Mon, 30 Mar 2015 15:03:29 +0000 (15:03 +0000)]
am
b64b7885: (-s ours) am
6e22b329: (-s ours) am
6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '
b64b78856cf6121e9956f8910f30656ebde5d024':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:56:54 +0000 (14:56 +0000)]
am
6e22b329: (-s ours) am
6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '
6e22b3293298b721815b321b503cbe4ce34ae77d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:56:24 +0000 (14:56 +0000)]
am
e9669588: (-s ours) Import translations. DO NOT MERGE
* commit '
e9669588c22eeae992e6b6d237f311856e4886c2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:49:09 +0000 (14:49 +0000)]
am
6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '
6e6250b9613e7c236a07367fc800feece8bcd706':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:47:39 +0000 (07:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I451a8edb373ffeeddb1d05d6e5c15ff35d4c9109
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Mar 2015 14:38:42 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Mar 2015 14:36:26 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 30 Mar 2015 14:29:48 +0000 (07:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I401a825e79422050bc39fff0b7c8998354082478
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Mar 2015 12:50:27 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33c678add2505ec35670928d3e0c0c9751c66bda
Auto-generated-cl: translation import
Clara Bayarri [Mon, 30 Mar 2015 08:59:08 +0000 (08:59 +0000)]
Merge "Editor: Cleanup the unused ActionPopupWindow"
Jinsuk Kim [Mon, 30 Mar 2015 05:07:13 +0000 (05:07 +0000)]
Merge "CEC: Do not send <ARC Terminated> when init request gets rejected"
Mathieu Chartier [Mon, 30 Mar 2015 00:36:51 +0000 (00:36 +0000)]
am
2169c68a: am
d9dddea5: am
631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '
2169c68aa330670ab340ec7faaedb5e5a9a59360':
Change getDeclaredFieldsUnchecked call to new return value
Mathieu Chartier [Mon, 30 Mar 2015 00:26:46 +0000 (00:26 +0000)]
am
d9dddea5: am
631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '
d9dddea504d717120eaa5e9c15fe484e26511e92':
Change getDeclaredFieldsUnchecked call to new return value
Craig Mautner [Sun, 29 Mar 2015 23:49:56 +0000 (23:49 +0000)]
Merge "Still more debugging for bug
19823482"
Mathieu Chartier [Sun, 29 Mar 2015 22:42:53 +0000 (22:42 +0000)]
am
631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '
631565abd6cadd65befe197afa7bac0d44f70fb2':
Change getDeclaredFieldsUnchecked call to new return value
Jinsuk Kim [Thu, 26 Mar 2015 23:21:15 +0000 (08:21 +0900)]
CEC: Do not send <ARC Terminated> when init request gets rejected
System audio may reject <Request ARC Initiation> with a response
<Feature Abort> or just time out. Do not send <Request ARC Terminated>
in response so as not to turn off the ARC mode, as it may not be
the intended behavior.
Bug:
19928094
Change-Id: I469dfa53bf35dfbca7daa86a69763b10551663ec
Mathieu Chartier [Sun, 29 Mar 2015 22:30:41 +0000 (22:30 +0000)]
Merge "Change getDeclaredFieldsUnchecked call to new return value"
Wale Ogunwale [Sun, 29 Mar 2015 19:21:49 +0000 (19:21 +0000)]
Merge "Fixed issue with paused activity still freezing display."
Wale Ogunwale [Sun, 29 Mar 2015 00:21:05 +0000 (17:21 -0700)]
Fixed issue with paused activity still freezing display.
An activity freezes the display when it is relaunched when
configuration changes. If the activity takes time to launch and
another activity is launched before it is done, the activity that
froze the display will be paused and might not have the chance to
unfreeze the display. This will put WindowManager in an odd state.
We now unfreeze the display when an activity is done pausing in case
it was previously freezing the display.
Bug:
19823482
Change-Id: If5538aea639e06d0b8621646bf6b2e12d325287a
Craig Mautner [Sun, 29 Mar 2015 16:43:22 +0000 (09:43 -0700)]
Still more debugging for bug
19823482
Change-Id: I2a9270ebd0a31c9dc62732b67c640191549d396e
Svet Ganov [Sun, 29 Mar 2015 04:08:44 +0000 (21:08 -0700)]
Fix build
Change-Id: Ib3fc843ad02ea3a83f03cf1d6b063d4031da51b1
Svet Ganov [Sun, 29 Mar 2015 03:16:25 +0000 (03:16 +0000)]
Merge "Fix runtime permissinos toggling and relax XML parsing."
Svet Ganov [Sun, 29 Mar 2015 02:34:15 +0000 (19:34 -0700)]
Fix runtime permissinos toggling and relax XML parsing.
1. Fixed the case where runtime permissons can be toggled by a
developer via a system property.
2. Relaxed the runtime permission XML parsing to be more fault
toelrant and consistent wiht the reset of the package manager
parse code.
3. Fixed a deadlock due to calling in to the activity manager
with the package manager lock held to kill an app.
Change-Id: I11dfb57ad4d8119baea79227dc2a3fe5e2208515
Tenghui Zhu [Sun, 29 Mar 2015 00:01:25 +0000 (00:01 +0000)]
Merge "Revert "Use AVD for checkbox animation.""
Tenghui Zhu [Sat, 28 Mar 2015 23:27:12 +0000 (23:27 +0000)]
Revert "Use AVD for checkbox animation."
This reverts commit
9734bdc97ee3049cdadfb04fce1fd76626934519.
Change-Id: I2736560a7712418b7b69507a82619b9ca8552014
Svet Ganov [Sat, 28 Mar 2015 20:23:10 +0000 (20:23 +0000)]
Merge "Fix a regression in settings parsing"
Svet Ganov [Sat, 28 Mar 2015 20:21:22 +0000 (13:21 -0700)]
Fix a regression in settings parsing
Change-Id: I222bac482a843112ae031b00c83e3765ea6b456c
Mike Lockwood [Sat, 28 Mar 2015 16:00:19 +0000 (16:00 +0000)]
Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature"
Andreas Gampe [Sat, 28 Mar 2015 05:18:14 +0000 (05:18 +0000)]
am
3fa46a0f: am
d7fb6d26: am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:18:03 +0000 (05:18 +0000)]
am
1bca3532: am
0e6b4da5: am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
1bca3532687675d81dea805b12577a6c3a00b4c3':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 05:11:07 +0000 (05:11 +0000)]
am
d7fb6d26: am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
d7fb6d26d809775996f70e23213392a3dcf10c8f':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:11:02 +0000 (05:11 +0000)]
am
0e6b4da5: am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
0e6b4da5ca53d338f351827f7a351edcd6281aaa':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 05:03:25 +0000 (05:03 +0000)]
am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:03:18 +0000 (05:03 +0000)]
am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 04:50:42 +0000 (04:50 +0000)]
Merge "Frameworks/base: Change String == to equals in Preference"
Andreas Gampe [Sat, 28 Mar 2015 04:50:07 +0000 (04:50 +0000)]
Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
Mathieu Chartier [Wed, 25 Mar 2015 20:35:38 +0000 (13:35 -0700)]
Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.
Bug:
19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
Christopher Tate [Sat, 28 Mar 2015 01:47:53 +0000 (01:47 +0000)]
Merge "Respect the transport's requestFullBackupTime() backoff"
Svet Ganov [Sat, 28 Mar 2015 00:59:35 +0000 (00:59 +0000)]
Merge "Relax the parsing code in settings provider."
Svet Ganov [Sat, 28 Mar 2015 00:55:08 +0000 (17:55 -0700)]
Relax the parsing code in settings provider.
The practice in the system server is to have lenient parsing code
to avoid the whole system being unusable due to a single XML error.
Change-Id: Idf44031edf5221966f3352ca2f83e284973ab95f
Christopher Tate [Sat, 28 Mar 2015 00:58:18 +0000 (17:58 -0700)]
Respect the transport's requestFullBackupTime() backoff
We now make sure to pause by at least requestFullBackupTime() between full-data
backup operations, to give the transport the ability to apply traffic control
while we're running the queue of eligible packages.
Also, we now reset a package's queue position whenever a full-data backup for
that package is run explicitly via adb.
Bug
19732890
Change-Id: I6cf24495ad18eebd55557f229d11c703e5b7f529
Makoto Onuki [Thu, 19 Mar 2015 18:24:00 +0000 (11:24 -0700)]
Enterprise quick contact 1/2
Now openQuickContact goes thorough DPM. When a lookup URI is build with
a lookup key returned by the enterprise lookup APIs for a corp contact, the
lookup key will have a special prefix. In that case we go through DPM
and have it launch QC on the managed profile, if the policy allows.
For now we use the same DPM policy as enterprise-caller-id to disable this.
Design doc: go/cp2-mnc-enterprise-dd
Bug
19546108
Change-Id: I4840e7fad8a6a60249df07d993d26d03619650d4
Geoff Mendal [Sat, 28 Mar 2015 00:12:54 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 28 Mar 2015 00:12:34 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 28 Mar 2015 00:12:13 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Christopher Tate [Fri, 27 Mar 2015 23:50:57 +0000 (23:50 +0000)]
Merge "Add payload-size preflight stage to full transport backup"
Alex Klyubin [Fri, 27 Mar 2015 23:49:25 +0000 (23:49 +0000)]
am
23c2b8e8: am
d7e06104: am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
23c2b8e81ec5a6e0c344f09e728d87300ac29bc2':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:49:17 +0000 (23:49 +0000)]
am
db22c659: am
3e89fac5: am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
db22c6595c1b1949ff5473517609a7315b8e130f':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:43:31 +0000 (23:43 +0000)]
am
8045a23a: am
c27d3c2b: am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
8045a23a08898abadcd3e3d355d65d757480e1e6':
CEC: Explicitly turn on screen for remote control passthrough
Geoff Mendal [Fri, 27 Mar 2015 23:40:35 +0000 (16:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae448041b1480ae3582be4c0b07dc4e4b1688e25
Auto-generated-cl: translation import
Alex Klyubin [Fri, 27 Mar 2015 23:37:49 +0000 (23:37 +0000)]
am
d7e06104: am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
d7e0610477b1a97ce6b566a19e1fe9246bc30f52':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:37:44 +0000 (23:37 +0000)]
am
3e89fac5: am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
3e89fac56966fc30790430f128887a987fea63d8':
Allow entropy to be provided to some operations
Geoff Mendal [Fri, 27 Mar 2015 23:37:11 +0000 (16:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iedf7a61cde1c2eed81a716c76afeaaf1388794e2
Auto-generated-cl: translation import
Alex Klyubin [Fri, 27 Mar 2015 23:31:38 +0000 (23:31 +0000)]
am
8e7df37c: am
d880dc2f: am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
8e7df37c9af178cd443c487f258773c0017501aa':
Symmetric key import for AndroidKeyStore.
Adam Metcalf [Fri, 27 Mar 2015 23:26:30 +0000 (23:26 +0000)]
Merge "Add support for GmsCore to apilint.py"
Alex Klyubin [Fri, 27 Mar 2015 23:26:08 +0000 (23:26 +0000)]
am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
36ee836d2f6e6df59d6a20a69421639bacf25559':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:25:59 +0000 (23:25 +0000)]
am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:24:11 +0000 (23:24 +0000)]
am
c27d3c2b: am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
c27d3c2bd440a69d22bec8dd2c7bfe511fa53eba':
CEC: Explicitly turn on screen for remote control passthrough
Geoff Mendal [Fri, 27 Mar 2015 23:23:30 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie3cde38ec6847cf49d6ce2ed9b21b23f27ef5d63
Auto-generated-cl: translation import
Adam Metcalf [Fri, 27 Mar 2015 23:11:23 +0000 (16:11 -0700)]
Add support for GmsCore to apilint.py
Add flag to allow references to google.
Refactor argument parsing to use argparse.
Change-Id: I5fd3b6628a00113b9644dcae2919632db056909d
Alex Klyubin [Fri, 27 Mar 2015 23:13:24 +0000 (23:13 +0000)]
am
d880dc2f: am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
d880dc2fb23aa3564c46169f7b0651bd2ca2c2de':
Symmetric key import for AndroidKeyStore.
Bart Sears [Fri, 27 Mar 2015 23:08:46 +0000 (23:08 +0000)]
am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
c03cfc9d86c4324464ae44b49c7ac31c9a4bba50':
CEC: Explicitly turn on screen for remote control passthrough
Alex Klyubin [Fri, 27 Mar 2015 22:59:18 +0000 (22:59 +0000)]
Merge "Symmetric key generation for AndroidKeyStore."
Alex Klyubin [Fri, 27 Mar 2015 21:39:28 +0000 (14:39 -0700)]
Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.
Bug:
18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
Elliott Hughes [Fri, 27 Mar 2015 22:45:07 +0000 (22:45 +0000)]
Merge "Document that Time doesn't support pseudo-zones."
Adrian Roos [Fri, 27 Mar 2015 22:18:38 +0000 (22:18 +0000)]
Merge "Add emergency assistance API and setting"
Elliott Hughes [Fri, 27 Mar 2015 22:18:12 +0000 (15:18 -0700)]
Document that Time doesn't support pseudo-zones.
Bug:
19110194
Change-Id: I653b7dc46d5f15da70435f6bddd49042f4d03b54
Yin-Chia Yeh [Fri, 27 Mar 2015 21:50:41 +0000 (21:50 +0000)]
Merge "Camera: codegen doc update"
Yin-Chia Yeh [Fri, 27 Mar 2015 20:54:04 +0000 (13:54 -0700)]
Camera: codegen doc update
Bug:
19966527
Change-Id: I47c450d5661374c0a51d02bb79fccff1d26338f7
Alex Klyubin [Fri, 27 Mar 2015 21:42:08 +0000 (21:42 +0000)]
am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
Symmetric key import for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 21:38:43 +0000 (21:38 +0000)]
Merge "Allow entropy to be provided to some operations"
Chad Brubaker [Fri, 27 Mar 2015 21:28:35 +0000 (14:28 -0700)]
Allow entropy to be provided to some operations
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.
Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
Adrian Roos [Thu, 26 Mar 2015 19:31:16 +0000 (12:31 -0700)]
Add emergency assistance API and setting
Bug:
19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
Bart Sears [Fri, 27 Mar 2015 21:23:01 +0000 (21:23 +0000)]
am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
d4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
4a26c391d08dfa6a3c189293f0fc163b817b1b49':
CEC: Explicitly turn on screen for remote control passthrough
John Spurlock [Fri, 27 Mar 2015 21:13:39 +0000 (21:13 +0000)]
Merge "AudioService: Observe changes to output devices per-stream."
John Spurlock [Fri, 27 Mar 2015 21:13:21 +0000 (21:13 +0000)]
Merge "Fix a few found doc problems."
Wenchao Tong [Tue, 17 Mar 2015 23:14:23 +0000 (16:14 -0700)]
Keep debug information in NetworkStats files
Create two special SETs.
SET_DBG_VPN_IN is used by individual applications to know
how much traffic of the NetworkIdentity was actually moved
from a VPN app.
SET_DBG_VPN_OUT is used by the VPN app to know how much
traffic of the NetworkIdentity was deducted.
A debug application can restore the raw stats by these
entries.
raw_traffic = recorded_entry (TAG_NONE, SET_ALL)
+ recorded_entry (TAG_NONE, SET_DBF_VPN_OUT)
- recorded_entry (TAG_NONE, SET_DBF_VPN_IN)
The two debug SETs are not returned by
NetworkStatsService.openSession(). These debug entries are
retrieved by NetworkStatsCollection.dump().
Bug:
19536273
Change-Id: I03ef9f7667f5f2f48cbe3f6b11447fe7ead8ad3b
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Wenchao Tong [Fri, 27 Mar 2015 20:43:33 +0000 (20:43 +0000)]
Merge "Create a Benchmark test for NetworkStats."