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

148183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
fd644218b3 am e9436509: Fix bugs on timer recording action. 
* commit 'e9436509e072c6db95d7f768c4703a20189e736a':
  Fix bugs on timer recording action.
 2014-08-05 13:06:22 +00:00
Dongwon Kang
254cd72733 am 6281f060: Merge "TIF: make the documentation consistent." into lmp-dev 
* commit '6281f0608903fd907c5b582ab75c7b0046cb6f32':
  TIF: make the documentation consistent.
 2014-08-05 13:06:17 +00:00
Tadashi G. Takaoka
231c6d5408 am a854e53f: Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 
* commit 'a854e53fbed474bec3360a084657ef25ca8445cb':
  Fix unnecessarily non-static inner class to static inner
 2014-08-05 13:06:07 +00:00
Wonsik Kim
f299e6a235 am 520d746b: Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev 
* commit '520d746bb32d57ec0ca55c5464201b91fe309a84':
  TIF: fix JTvInputHal::removeStream issue
 2014-08-05 13:06:02 +00:00
Jungshik Jang
fdba000ba2 am ef1e889d: Merge "Fix invalid annotation, @throw" into lmp-dev 
* commit 'ef1e889d0c39aed12df1441363263b54e6adb0bf':
  Fix invalid annotation, @throw
 2014-08-05 13:05:49 +00:00
Wonsik Kim
9fbb6d2bfc am e26f6f16: Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 
* commit 'e26f6f167a969d2845049623ca385c6dd0e1a374':
  TIF: implement setVolume for hardware inputs
 2014-08-05 13:05:41 +00:00
Jinsuk Kim
8fe39a904b am c4319a19: Plumbing for HdmiTvClient and HdmiControlService 
* commit 'c4319a19cb18d223f2fe3b9834fee6e920d9057c':
  Plumbing for HdmiTvClient and HdmiControlService
 2014-08-05 13:05:37 +00:00
Yuncheol Heo
6aae6528a6 Refactor <Feature Abort> logic to concentrate it in one place. 
- Don't reply from the unregistered address.
- Use "unrecognized opcode" as the default reason.

Bug: 16799466, Bug: 16798785
Change-Id: I7c2ece6436f7ebd59986d2baf4f45cd86e6622d9
 2014-08-05 18:17:45 +09:00
Jungshik Jang
faa49bc896 Fix bugs on timer recording action. 
1. Apply masking to feature abort of SetXXXTimer
2. Announce error when failed to send SetXXXTimer.
3. Remove TimerRecordingAction when deivce is disabled.
4. Report clear timer record error thru onClearTimerRecordingResult.

Change-Id: Id243aa25481dad57509b4229ca214fa9b6b00fdc
 2014-08-05 17:24:39 +09:00
Jinsuk Kim
6ffb03816f Plumbing for HdmiTvClient and HdmiControlService 
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService

Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
 2014-08-05 13:05:49 +09:00
Yuncheol Heo
4241614f4f am 49605e57: am b5984269: am 8ce97924: Let STB oneTouchPlay on SCREEN_ON event. 
* commit '49605e57f95edb343ea68925a4847c6cf512f4a8':
  Let STB oneTouchPlay on SCREEN_ON event.
 2014-08-05 02:46:09 +00:00
Yuncheol Heo
815ee1bc3f am b5984269: am 8ce97924: Let STB oneTouchPlay on SCREEN_ON event. 
* commit 'b5984269eaf605a659e15f168ca47e1251eef212':
  Let STB oneTouchPlay on SCREEN_ON event.
 2014-08-05 02:41:49 +00:00
Yuncheol Heo
7fbecb6222 am 8ce97924: Let STB oneTouchPlay on SCREEN_ON event. 
* commit '8ce9792440ccb8211c99f3eb82efca6f30d1fc71':
  Let STB oneTouchPlay on SCREEN_ON event.
 2014-08-05 02:37:46 +00:00
Yuncheol Heo
fc44e4e03c Let STB oneTouchPlay on SCREEN_ON event. 
- Eleborate the reason code to initiate the initialization.

Bug: 16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
 2014-08-05 11:15:59 +09:00
Shriram Ganesh
ca3cafeaa0 am ed4c269a: am c57b793e: am 5562eb6c: IMS Framework & AIDL Changes for Call Barring & String Error Codes. 
* commit 'ed4c269a6d715771b08e005cc4d3070e359888d5':
  IMS Framework & AIDL Changes for Call Barring & String Error Codes.
 2014-08-05 01:11:11 +00:00
Shriram Ganesh
ff6144c8ab am c57b793e: am 5562eb6c: IMS Framework & AIDL Changes for Call Barring & String Error Codes. 
* commit 'c57b793ed36e7dcfcf5fdd68b4090f4a9a0f1787':
  IMS Framework & AIDL Changes for Call Barring & String Error Codes.
 2014-08-05 01:07:16 +00:00
Shriram Ganesh
6a8d7ac947 am 5562eb6c: IMS Framework & AIDL Changes for Call Barring & String Error Codes. 
* commit '5562eb6ce426838214f6e1206af51511ab959747':
  IMS Framework & AIDL Changes for Call Barring & String Error Codes.
 2014-08-05 01:03:27 +00:00
Shriram Ganesh
61aac3aa0a IMS Framework & AIDL Changes for Call Barring & String Error Codes. 
Change-Id: I66fdbbd175c13261c283627999f37071259f7a6a
 2014-08-05 00:48:40 +00:00
Jungshik Jang
74e403fd39 am 6cc6bd39: am 1bc420cd: am 70ac06d8: Merge "Implement clear timer." into lmp-dev 
* commit '6cc6bd399f41c6450d78ec0d4f4158a93f29affb':
  Implement clear timer.
 2014-08-05 00:45:22 +00:00
Jungshik Jang
4bf30389bf am 1bc420cd: am 70ac06d8: Merge "Implement clear timer." into lmp-dev 
* commit '1bc420cd8fcf7940a3467db4fee330fbbab84c00':
  Implement clear timer.
 2014-08-05 00:41:15 +00:00
Jean-Michel Trivi
fe3e10deaf Merge "AudioAttributes: implement hashcode and equals methods" into lmp-dev 2014-08-05 00:39:51 +00:00
Jungshik Jang
0ff1639113 am 70ac06d8: Merge "Implement clear timer." into lmp-dev 
* commit '70ac06d844c12df388af6de22dd25a71be28af7f':
  Implement clear timer.
 2014-08-05 00:37:09 +00:00
Hector Dearman
ae9251262a Merge "Fix CookieSyncManager package summary" into lmp-dev 2014-08-05 00:35:13 +00:00
Hector Dearman
24f7e61a38 Fix CookieSyncManager package summary 
Putting the deprecated at the beginning of a class comment seems
to cause problems with JavaDoc so I've moved it to the end.

Bug: 16799480
Change-Id: Ia23dab2ad8ceb8e107e047480b5cb324d11a1457
 2014-08-05 10:55:30 +01:00
John Spurlock
fdfd4f8f83 Merge "Allow user-prioritized packages through in priority mode." into lmp-dev 2014-08-05 00:35:13 +00:00
John Spurlock
6ac5f8df62 Allow user-prioritized packages through in priority mode. 
Bug:16396715
Change-Id: I115d717e5c25500407d4f7876f070a1497fb2887
 2014-08-05 09:58:19 -04:00
Przemyslaw Szczepaniak
1eb47e1624 Merge "Set the TTS voice name for the default language." into lmp-dev 2014-08-05 00:35:13 +00:00
Przemyslaw Szczepaniak
fd80746bb9 Set the TTS voice name for the default language. 
This changes makes the initial, default language set and
the #setLanguage call with the default language as input
exactly the same.

Previously, the requests made after the initial default language
set were missing the name of the default voice.

+ Some tests clean-up. Some of them fail due to issues with
Locale#toLanguageTag upper-casing the variant field.

Change-Id: I5470617007fe45462b7198bf62a03eb5fe47a590
 2014-08-05 14:50:34 +01:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Santos Cordon
6c8aecd3f2 Merge "Revert "Make Connection threadsafe"" into lmp-dev 2014-08-05 00:34:22 +00:00
Santos Cordon
d34e5713c9 Revert "Make Connection threadsafe" 
This reverts commit 53488bf3d152eb0ecacca5716c763e8cd7ab28ae.

Change-Id: Ia13c510279e600e8bd1445fd63e2cd6503f4077e
 2014-08-05 18:54:03 +00:00
Justin Koh
106c16fbd9 Merge "Allow listeners to see children" into lmp-dev 2014-08-05 00:34:22 +00:00
Justin Koh
8d11a5aa2d Allow listeners to see children 
Allow listeners to see notification children. Since L is not baked yet, keeping
this version check makes it difficult to test apps.

Bug: 16733244
Change-Id: I70afd6b99fc18c1f0b9188279c04fab80c37d414
 2014-08-04 18:31:26 -07:00
Jorim Jaggi
96caa68279 Merge "Revert "Clean up hiden notifications on Keyguard handling"" into lmp-dev 2014-08-05 00:19:02 +00:00
Jorim Jaggi
f641174eb9 Revert "Clean up hiden notifications on Keyguard handling" 
This reverts commit d9267cae958b572b715d22a4905b18749a369c9f.

Too much performance regression - need to figure out something else.

Change-Id: I2d399add74402e1c036235ec095a053a6d5b828e
 2014-08-05 17:10:43 +00:00
Adrian Roos
ca4ab058ec Merge "QS: Enable availability listener for flashlight" into lmp-dev 2014-08-05 00:19:02 +00:00
Adrian Roos
034a6c9667 QS: Enable availability listener for flashlight 
Enables the availability listener now that the
underlying framwork is stable.

Bug: 16483222
Change-Id: I586a43941ade1ee8a8f3cb1a087e5356539703c1
 2014-08-05 16:54:13 +02:00
John Spurlock
9c84aab892 Merge "QS: Share usage tracking timeout with color inversion tile." into lmp-dev 2014-08-05 00:19:02 +00:00
John Spurlock
3976f3d943 QS: Share usage tracking timeout with color inversion tile. 
Pull out 30-day feature timeout code into a separate helper, use
in both ColorInversionTile and HotspotTile.

Expose an intent to force a reset of the timeout.

Change-Id: Ic0b89913fd5cec4e1df3cb0d5a548f052a60550f
 2014-08-05 00:41:04 -04:00
Jason Monk
966e258396 Merge "Disable heads up when DISABLE_NOTIFICATION_ALERT" into lmp-dev 2014-08-05 00:15:52 +00:00
Jason Monk
f701954d4e Disable heads up when DISABLE_NOTIFICATION_ALERT 
When notification alerts are disabled also turn off heads up. This
will fall back to the old behavior, which can allow the fullscreen
intent to be triggered instead.

Bug: 14157742
Change-Id: I4b6e3d9383894b1674d600c374ff8968ca53513e
 2014-08-05 17:16:56 +00:00
Nicolas Prevot
fda7e2ae83 Merge "Security fixes related to cross-user content." into lmp-dev 2014-08-05 00:15:52 +00:00
Nicolas Prevot
504d78ea10 Security fixes related to cross-user content. 
Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.

BUG: 16779492

Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
 2014-08-05 17:05:09 +00:00
Torne (Richard Coles)
c19f854965 Merge "Log the version of the WebView package used." into lmp-dev 2014-08-05 00:15:52 +00:00
Torne (Richard Coles)
0606cd572a Log the version of the WebView package used. 
To aid in debugging app behaviour when WebView updates may be present,
log the package name, version name, and version code of the WebView
package when we are about to load it into an application. Do this before
we actually load any part of the package in case of an issue loading it
in the first place.

Change-Id: Id653bad431760b7ead8e3f8eb29f9d6a8bb68d07
 2014-08-05 16:12:09 +01:00
Jorim Jaggi
05204dc227 Merge "Dismiss all layout updates." into lmp-dev 2014-08-05 00:15:52 +00:00
Shriram Ganesh
d06617061b am 7d9198b1: am 6cd7f0d7: am 4642c277: Add changes for LTE to IWLAN Handover Notifications for an IMS Call 
* commit '7d9198b1ba76a01682a638c5a6f8c6667e370633':
  Add changes for LTE to IWLAN Handover Notifications for an IMS Call
 2014-08-05 00:12:41 +00:00
Jungshik Jang
363c4efa51 Merge "Fix invalid annotation, @throw" into lmp-dev 2014-08-05 00:07:36 +00:00
Jungshik Jang
f406cc3442 Fix invalid annotation, @throw 
Change-Id: Id22635414567a8b525032df792f2309102d7ae62
 2014-08-05 14:27:17 +09:00
Wonsik Kim
ee3166e0d5 Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 2014-08-05 00:07:36 +00:00