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

148152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tadashi G. Takaoka
312ac2d88c am f6e2baf0: am 184dadef: am a854e53f: Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 
* commit 'f6e2baf08fc0234761075c79da58f8e1b7fcb429':
  Fix unnecessarily non-static inner class to static inner
 2014-08-05 13:26:26 +00:00
Wonsik Kim
069ad7709b am 3f24e235: am 3a1a0f23: am 520d746b: Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev 
* commit '3f24e235dc7cf11a241b468b1ec4b18f0d962769':
  TIF: fix JTvInputHal::removeStream issue
 2014-08-05 13:26:22 +00:00
Jungshik Jang
e4491b6c9e am f1caed8a: am 71758d5b: am ef1e889d: Merge "Fix invalid annotation, @throw" into lmp-dev 
* commit 'f1caed8a395bef295e5a9c64d1b3c46528856367':
  Fix invalid annotation, @throw
 2014-08-05 13:26:18 +00:00
Wonsik Kim
ef03681061 am 0ad2ffb5: am 7dbde80e: am e26f6f16: Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 
* commit '0ad2ffb552026308694e427de833e1b64e8a26da':
  TIF: implement setVolume for hardware inputs
 2014-08-05 13:26:14 +00:00
Jinsuk Kim
02671bfe0e am f661cc31: am 760ad583: am c4319a19: Plumbing for HdmiTvClient and HdmiControlService 
* commit 'f661cc31b9ae87969767e940ab92cc40ad4d5517':
  Plumbing for HdmiTvClient and HdmiControlService
 2014-08-05 13:26:10 +00:00
Jorim Jaggi
f479792e05 New swipe-up assist animation for L. 
Bug: 16307470
Bug: 14623152
Change-Id: Ib7e0381d118bda177981cc56ec9a8fb418dfb0e3
 2014-08-05 15:24:26 +02:00
Jorim Jaggi
b564395cd6 am 54987f47: am bf16485a: Merge "Dismiss all layout updates." into lmp-dev 
* commit '54987f4738d9aba37d70be35bf9421e65a1c0ddf':
  Dismiss all layout updates.
 2014-08-05 13:20:39 +00:00
Yuncheol Heo
1cad2e194a am 5ccc3603: am 4e11bf93: Refactor <Feature Abort> logic to concentrate it in one place. 
* commit '5ccc3603c8e2ef3994d351c8d207b04146c97751':
  Refactor <Feature Abort> logic to concentrate it in one place.
 2014-08-05 13:20:35 +00:00
Sungsoo Lim
5f32b39c4c am ccf44a00: am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 
* commit 'ccf44a0048ee514ced9adcc70f0ca25bb8b9acb6':
  TIF: A preliminary CL to add multiple rating systems
 2014-08-05 13:20:30 +00:00
Jungshik Jang
93dfb24683 am c8c34f1f: am 69f08659: Merge "Refine recode apis." into lmp-dev 
* commit 'c8c34f1f57d81296242603411dedf18c3bcc3333':
  Refine recode apis.
 2014-08-05 13:20:26 +00:00
Jungshik Jang
fb0e811e53 am 3bf4a01d: am e9436509: Fix bugs on timer recording action. 
* commit '3bf4a01d7513aa0b3b0c47476d05ce9ba66b7aa8':
  Fix bugs on timer recording action.
 2014-08-05 13:20:22 +00:00
Dongwon Kang
f1a734f244 am 12d9d720: am 6281f060: Merge "TIF: make the documentation consistent." into lmp-dev 
* commit '12d9d720ee43dacd0b73bbc8c67d5bd9378acb42':
  TIF: make the documentation consistent.
 2014-08-05 13:20:18 +00:00
Tadashi G. Takaoka
7b1195d416 am 184dadef: am a854e53f: Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 
* commit '184dadef6e2b9e3ea827bfc54015a2560faa4421':
  Fix unnecessarily non-static inner class to static inner
 2014-08-05 13:20:14 +00:00
Wonsik Kim
4dfe1efe7f am 3a1a0f23: am 520d746b: Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev 
* commit '3a1a0f23b6fcae3f75d84b97fef2758ac6ca83c8':
  TIF: fix JTvInputHal::removeStream issue
 2014-08-05 13:20:08 +00:00
Jungshik Jang
5281e6c775 am 71758d5b: am ef1e889d: Merge "Fix invalid annotation, @throw" into lmp-dev 
* commit '71758d5b037663308b98f3781448b68dc4422012':
  Fix invalid annotation, @throw
 2014-08-05 13:20:04 +00:00
Wonsik Kim
1c6c74c7ee am 7dbde80e: am e26f6f16: Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 
* commit '7dbde80e4cc34a1a1f9df35c31f2e7ef3ea37be9':
  TIF: implement setVolume for hardware inputs
 2014-08-05 13:20:00 +00:00
Jinsuk Kim
60c4edd3dd am 760ad583: am c4319a19: Plumbing for HdmiTvClient and HdmiControlService 
* commit '760ad58394da64f61e581b542160eae074e5c6b7':
  Plumbing for HdmiTvClient and HdmiControlService
 2014-08-05 13:19:56 +00:00
Jorim Jaggi
899ba487b6 am bf16485a: Merge "Dismiss all layout updates." into lmp-dev 
* commit 'bf16485a3626782b50d8c71c69a5771851fe930c':
  Dismiss all layout updates.
 2014-08-05 13:06:58 +00:00
Yuncheol Heo
4e61f51c14 am 4e11bf93: Refactor <Feature Abort> logic to concentrate it in one place. 
* commit '4e11bf932d6cc7b9644e8571a411f10586106187':
  Refactor <Feature Abort> logic to concentrate it in one place.
 2014-08-05 13:06:48 +00:00
Sungsoo Lim
edf15bd171 am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 
* commit '291e9b9d30c461ad96e7619ee680d3dfe029f75c':
  TIF: A preliminary CL to add multiple rating systems
 2014-08-05 13:06:31 +00:00
Jungshik Jang
ca1a00e397 am 69f08659: Merge "Refine recode apis." into lmp-dev 
* commit '69f08659eeb72137798ae8d43ed83b97e9b1722e':
  Refine recode apis.
 2014-08-05 13:06:26 +00:00
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
Santos Cordon
6c8aecd3f2 Merge "Revert "Make Connection threadsafe"" into lmp-dev 2014-08-05 00:34:22 +00:00