drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,856 Commits 1 Branch 0 Tags
Commit Graph

153856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Dan Sandler
05a5c4e3fa am c7604ebe: am 3dd1a1f0: am a673ee62: Merge "Update soundscape for L, using classic names." into lmp-dev 
* commit 'c7604ebeab12d75c5adba172ff439d0d56aa1963':
  Update soundscape for L, using classic names.
 2014-08-28 13:24:40 +00:00
Dan Sandler
13b0086c3a am 3dd1a1f0: am a673ee62: Merge "Update soundscape for L, using classic names." into lmp-dev 
* commit '3dd1a1f0aba35d4ce0a1b5d550a6d65b0a631f6b':
  Update soundscape for L, using classic names.
 2014-08-28 13:12:39 +00:00
Selim Cinek
0d61b51852 Fixed a flash of the preview image when going to the dialer 
The preview image was animating even though it should not have
leading to a weird flash.

Bug: 17261091
Change-Id: I168eae25eb654ceb79e055fb0d0189c31cb0bb3d
 2014-08-28 15:09:29 +02:00
Selim Cinek
95ed59283b Fixed a bug where notifications could remain in the overlay. 
This led to notifications being visible even though they should
have been removed

Bug: 17295716
Change-Id: I05a243d5c9ca359d1f5ca29a7535935d6e61a4d6
 2014-08-28 15:09:29 +02:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner 
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
 2014-08-28 15:09:28 +02:00
Dan Sandler
771aeaf390 am a673ee62: Merge "Update soundscape for L, using classic names." into lmp-dev 
* commit 'a673ee6209fd64acafafb867ab40c6944ca56696':
  Update soundscape for L, using classic names.
 2014-08-28 13:00:34 +00:00
Jorim Jaggi
3363b908bb am 8484d990: am 0b198fa9: am 1c20d304: Start intent chooser after Keyguard is gone 
* commit '8484d990efafd7d10888a56beb0221b0c4148468':
  Start intent chooser after Keyguard is gone
 2014-08-28 12:53:54 +00:00
Dan Sandler
e6afe9c75c Merge "Update soundscape for L, using classic names." into lmp-dev 2014-08-28 12:49:26 +00:00
Jorim Jaggi
d0bca271e3 am 0b198fa9: am 1c20d304: Start intent chooser after Keyguard is gone 
* commit '0b198fa9d4151243fb98936c3b19e33b466fcc7b':
  Start intent chooser after Keyguard is gone
 2014-08-28 12:42:03 +00:00
Jorim Jaggi
109cb57afa am 1c20d304: Start intent chooser after Keyguard is gone 
* commit '1c20d304810aa73ae5a73fc8c555599d33fc411f':
  Start intent chooser after Keyguard is gone
 2014-08-28 12:30:01 +00:00
Jorim Jaggi
a076303434 am f90463b9: am 222fb84e: am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit 'f90463b978e22cdf9dd12289b5fe8bcddddd09c7':
  Fix large text setting for QS
 2014-08-28 11:33:31 +00:00
Jorim Jaggi
74610a7b9c am 222fb84e: am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit '222fb84ecc32032147a8414a69bbf3e7d6023442':
  Fix large text setting for QS
 2014-08-28 11:21:59 +00:00
Jorim Jaggi
75126cd654 am 5f76e441: am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '5f76e4414f46783a55e14ba09cae462e74bd6949':
  Make it possible to disable camera on lockscreen
 2014-08-28 11:21:48 +00:00
Jorim Jaggi
746f7facf2 Start intent chooser after Keyguard is gone 
If we have an intent chooser on the camera intent, we need to launch
it after the Keyguard is fully gone because the ResolveActivity would
finish itself if it is launched behind the Keyguard.

Bug: 16570873
Change-Id: I2fdb4975fa0a6510e8853c6042383089570ec1f5
 2014-08-28 13:10:12 +02:00
Jorim Jaggi
524735e3ba am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '18cc6ef2eadd6ffa15cbdefe59270bda8a94bf4b':
  Make it possible to disable camera on lockscreen
 2014-08-28 11:10:03 +00:00
Jorim Jaggi
ff24c77811 am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit '6b5a7d8247b46da8d14fe4e0bb2cf309eb68b9ce':
  Fix large text setting for QS
 2014-08-28 11:09:28 +00:00
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 11:01:36 +00:00
Jorim Jaggi
2cad81b2a2 am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '5df9d4c47d12424fb5d6653fef6b8e8952af40b5':
  Make it possible to disable camera on lockscreen
 2014-08-28 10:57:46 +00:00