John Spurlock
1bb69d0688
am f1e0b838: am dcd367d2: am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev
...
* commit 'f1e0b838cefefe48130b2aa3e4461a37ea55b6a7':
Enhance audio service dumpsys.
2014-08-28 17:22:21 +00:00
John Reck
8df7949d48
am 0ed484c5: am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev
...
* commit '0ed484c59b308080617037e11a6100e8176dc974':
Actually end animators on tree destruction
2014-08-28 17:22:17 +00:00
Chet Haase
fb609eacf0
am d8646c8d: am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
...
* commit 'd8646c8d31e55ff4dd2fbf80f13a545c65925d72':
Canceling ViewPropertyAnimator now removes pending actions
2014-08-28 17:22:12 +00:00
Robert Greenwalt
6afc1ac0d7
am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev
...
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
Clean up Connectivity Logging.
2014-08-28 17:10:53 +00:00
John Spurlock
52ccce940b
am dcd367d2: am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev
...
* commit 'dcd367d2144fd2b19e6ed8c824e0aebcecdab0c8':
Enhance audio service dumpsys.
2014-08-28 17:09:40 +00:00
John Reck
778cef5b30
am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev
...
* commit '16c661747022d0861d98a1d3145780912f5b809c':
Actually end animators on tree destruction
2014-08-28 17:09:34 +00:00
Chet Haase
b198e5e475
am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
...
* commit 'b6c2cf70d0e4918093e1ca3d1056facbf196ac7c':
Canceling ViewPropertyAnimator now removes pending actions
2014-08-28 17:09:29 +00:00
Robert Greenwalt
c8ff9c4d9f
am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev
...
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
Clean up Connectivity Logging.
2014-08-28 16:54:42 +00:00
John Spurlock
dac3530bc9
am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev
...
* commit '70dcf48700875d43b4ec845595c862a96a80f998':
Enhance audio service dumpsys.
2014-08-28 16:53:32 +00:00
John Reck
d9579be9f8
am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev
...
* commit '2b21f4622bdbdcacaef2d19a5f823b4471cd0db4':
Actually end animators on tree destruction
2014-08-28 16:53:27 +00:00
Chet Haase
d23388fd31
am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
...
* commit 'f223babba9435874111d031610aad1968bcdec0b':
Canceling ViewPropertyAnimator now removes pending actions
2014-08-28 16:53:24 +00:00
John Spurlock
2ac81fbfae
Merge "Enhance audio service dumpsys." into lmp-dev
2014-08-28 16:50:09 +00:00
John Reck
e9a204f044
Merge "Actually end animators on tree destruction" into lmp-dev
2014-08-28 16:48:04 +00:00
Robin Lee
de139a7953
am 427ff190: am 2509e94c: am 6c581286: Merge "Relocate broken getCallingUserId() calls" into lmp-dev
...
* commit '427ff1903e0e202ffece1b216206bd9fb4d9b425':
Relocate broken getCallingUserId() calls
2014-08-28 16:47:50 +00:00
Jeff Sharkey
d380f5604f
am bc55cead: am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
...
* commit 'bc55cead16c51a846c3fc1c8afd2aaf3d02e0b25':
Define EXTRA_SIZE for ContentProviders.
2014-08-28 16:47:39 +00:00
Chet Haase
06c34e7cbe
Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
2014-08-28 16:42:27 +00:00
Robert Greenwalt
b750b75541
am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev
...
* commit '9773330994e2ba41f950368bfa51d2c0c1e6c5b4':
Clean up Connectivity Logging.
2014-08-28 16:40:42 +00:00
Robin Lee
827e4cbba1
am 2509e94c: am 6c581286: Merge "Relocate broken getCallingUserId() calls" into lmp-dev
...
* commit '2509e94ccf0208a7ada0f32ba61b6441b838e55c':
Relocate broken getCallingUserId() calls
2014-08-28 16:36:05 +00:00
Jeff Sharkey
896fe7aa04
am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
...
* commit 'cb1236be15023152535cedfb9ed20a0c8b94ada1':
Define EXTRA_SIZE for ContentProviders.
2014-08-28 16:36:01 +00:00
Robert Greenwalt
2836dbb953
Merge "Clean up Connectivity Logging." into lmp-dev
2014-08-28 16:29:55 +00:00
Robin Lee
ec765d2fb1
am 6c581286: Merge "Relocate broken getCallingUserId() calls" into lmp-dev
...
* commit '6c5812863f61ea0d1139479c424d26dbf6f5204a':
Relocate broken getCallingUserId() calls
2014-08-28 16:23:12 +00:00
Jeff Sharkey
a0e5c6ebab
am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
...
* commit '7cb28e7b999e0e243b85d57b156eebe1661362be':
Define EXTRA_SIZE for ContentProviders.
2014-08-28 16:23:07 +00:00
John Spurlock
2b29bc4c1c
Enhance audio service dumpsys.
...
- Add device name for keys
- Add max volume for streams
- Add missing stream name constant
Bug:16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
2014-08-28 12:20:05 -04:00
Jae Seo
b4417846a4
am 88da6260: am 32b59261: am 5cff0b76: Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev
...
* commit '88da62601f5a8b2c5ae40ccc51c83f3ccd7c8979':
Start TvInputManagerService when the device supports FEATURE_LIVE_TV
2014-08-28 16:16:34 +00:00
Robin Lee
19293d2b44
Merge "Relocate broken getCallingUserId() calls" into lmp-dev
2014-08-28 16:15:36 +00:00
Jeff Sharkey
ca5186e9d5
Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
2014-08-28 16:12:47 +00:00
Jae Seo
a7ed66c798
am 32b59261: am 5cff0b76: Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev
...
* commit '32b5926150b129b8d84bddca4dc95d1e42e48a20':
Start TvInputManagerService when the device supports FEATURE_LIVE_TV
2014-08-28 16:07:11 +00:00
Robin Lee
65c2797082
Relocate broken getCallingUserId() calls
...
This should not be invoked while the calling identity is cleared
because it will return the current user rather than the calling user.
Bug: 17314802
Change-Id: I587daa420b0976d41928ab7c34eeda2329c1341e
2014-08-28 16:59:11 +01:00
Jae Seo
1ce8e2b175
am 5cff0b76: Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev
...
* commit '5cff0b76bb73a4efd35598e4c90fb2847fbf5217':
Start TvInputManagerService when the device supports FEATURE_LIVE_TV
2014-08-28 15:55:32 +00:00
Jae Seo
f6a5d34167
Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev
2014-08-28 15:45:02 +00:00
John Reck
d0cd9db316
Actually end animators on tree destruction
...
Bug: 17313962
Change-Id: I66b86d50b415f9aa33da23297f22e2cf7f96f565
2014-08-28 08:43:39 -07:00
Chet Haase
5637b7d239
Canceling ViewPropertyAnimator now removes pending actions
...
Normally, calling cancel() on ViewPropertyAnimator() will cancel any
running animations as well as any associated actions (layers and
start/end actions). But if the animation is canceled before the first
frame, these other actions are still pending and will not be canceled.
This fix also cancels these pending actions.
Issue #17296082 VPA.cancel() doesn't clear the end action
Change-Id: If104d21c1e2d64516500048a06ba217284732ef0
2014-08-28 07:53:59 -07:00
Selim Cinek
4f82ee6d47
am f7454985: am 3ec368c1: am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit 'f7454985dfaaef12bb1b6617d15664ef2b082f50':
Fixed a flash of the preview image when going to the dialer
2014-08-28 14:02:01 +00:00
Selim Cinek
a2fd95138b
am 5f087df0: am 9f1a9f49: am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit '5f087df0a18eb9af0acbe6d5cd0b893d23562980':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 14:01:57 +00:00
John Spurlock
79b873ae90
am 0ab9ce87: am 9736f6a4: am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '0ab9ce87f86dc28b4670b4e2a18fd7463f4379d2':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 14:01:52 +00:00
Lajos Molnar
c5f688bb3f
am 0b307ba1: am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev
...
* commit '0b307ba11f5a6aaf3ab16f0c4bcdcc55106b786d':
media: update MediaCodec/Info/List/Format APIs based on review comments
2014-08-28 14:01:46 +00:00
Selim Cinek
bef1942fab
am 06585ecf: am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner
...
* commit '06585ecfc7e33fad947bd073e27ec4f18d804713':
Added a warning when the profile has an owner
2014-08-28 14:01:41 +00:00
Selim Cinek
075d4141bc
am 3ec368c1: am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit '3ec368c1a18982eaed446e60a4f9fde05f853549':
Fixed a flash of the preview image when going to the dialer
2014-08-28 13:55:34 +00:00
Selim Cinek
07c0d68e5c
am 9f1a9f49: am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit '9f1a9f49de0e88cb4b4c66a6e14eb6cc98289c9a':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 13:55:23 +00:00
John Spurlock
356014f7a8
am 9736f6a4: am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '9736f6a4550307f3025ca8c458da6440bed318a6':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 13:49:40 +00:00
Lajos Molnar
a9063962ea
am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev
...
* commit '05366fef16c5c54d3289645d1d94a05f3eb0e9e5':
media: update MediaCodec/Info/List/Format APIs based on review comments
2014-08-28 13:49:35 +00:00
Selim Cinek
f1d8349bb3
am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner
...
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
Added a warning when the profile has an owner
2014-08-28 13:49:25 +00:00
Selim Cinek
e2557b4e33
am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit 'b2cb86eef21897285244d2216ca9fbafa70adfd9':
Fixed a flash of the preview image when going to the dialer
2014-08-28 13:48:18 +00:00
Selim Cinek
9ddc82dff3
am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit 'a5ed4d381d4f1ca6b5056b7aefd2e5bc7b8c9667':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 13:48:14 +00:00
Selim Cinek
1a08a8f52f
Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
2014-08-28 13:37:23 +00:00
John Spurlock
c22fd76b66
am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '9af66133917d4cb0a5252f9f52e1352e72637bf0':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 13:36:47 +00:00
Lajos Molnar
93e8318ad5
am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev
...
* commit 'cb28f8533e4640be00c23e0332469995953fa1ba':
media: update MediaCodec/Info/List/Format APIs based on review comments
2014-08-28 13:36:42 +00:00
Selim Cinek
9a37d4bc3c
am 1bebe3c0: Added a warning when the profile has an owner
...
* commit '1bebe3c049c41a13bd5143c7ceec9d222ddd2d7d':
Added a warning when the profile has an owner
2014-08-28 13:36:37 +00:00
Selim Cinek
05546f455d
Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
2014-08-28 13:36:00 +00:00
John Spurlock
d7a94b3545
Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
2014-08-28 13:30:31 +00:00