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

8431 Commits

Author SHA1 Message Date
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 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
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
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
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Eric Laurent
e71ab3bef9 am 648e593b: am 02d9054a: am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit '648e593be4855b7303b26532b5680ef02afb02f8':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 22:25:00 +00:00
Eino-Ville Talvala
33bf20f3ef am 0d09fda1: am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '0d09fda101e557f2e8894746d14f8a190f2a1af0':
  Camera2: Correct error handling
 2014-08-27 21:51:05 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments 
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
 2014-08-27 14:40:02 -07:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent 
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
 2014-08-27 12:36:33 -07:00
Jean-Michel Trivi
d0ce27a698 am 3fcc7935: am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '3fcc7935df26183ce38a64532e2e86a1ec41d47c':
  SoundPool.Builder: document default values
 2014-08-27 18:49:47 +00:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Jae Seo
d824acc263 am aef26a7a: am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit 'aef26a7a3116649801600b6aca80039b200aa4c2':
  TIF: Make TV content rating names consistent
 2014-08-26 21:02:57 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Ji-Hwan Lee
8e5529326e am 81d8f52d: am 24e0e863: am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '81d8f52d974e7289563bfe9245f24536bee9d0a4':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:39:53 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call 
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
 2014-08-27 02:55:10 +09:00
Jae Seo
b2835e2700 TIF: Make TV content rating names consistent 
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
 2014-08-26 10:08:56 -07:00
Youngsang Cho
9068981ae1 am e5c88c85: am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'e5c88c859eaf735cdfb2c1ffedae62db12219fc0':
  Reset a session callback variable when tune is failed
 2014-08-26 15:06:11 +00:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed 
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
 2014-08-26 23:12:59 +09:00
Chulwoo Lee
ff7073e582 am a5b65fff: am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit 'a5b65fffe5433b2df884ffd767d2696e06445fbb':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:26:07 +00:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes 
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
 2014-08-26 21:30:26 +09:00
Chulwoo Lee
f06bc89505 am 35a04acd: am 8e602688: am 748bbc04: Merge "Fix checking trackId" into lmp-dev 
* commit '35a04acd2bc580469540af09a8824123cd51e528':
  Fix checking trackId
 2014-08-26 10:10:06 +00:00
Dongwon Kang
38624e50af am 5a3ba1c5: am 8853b9f2: am 0628fbf6: Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 
* commit '5a3ba1c5d04a409cd834081b4ed0faa157f97bb0':
  TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
 2014-08-26 10:09:41 +00:00
John Spurlock
f8200201cc am 0ae6ee5c: am f6a07ca1: am a60bba8d: Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 
* commit '0ae6ee5cd214b8211a8c6a2cc06fa41c0487d62e':
  QS: Wire up screen casting to tile/panel.
 2014-08-26 10:09:07 +00:00
Nancy Chen
d7b43eae63 am ff0847ce: am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 
* commit 'ff0847ced3191ba019b41524855646335d717f62':
  API review PhoneManager -> TelecommManager. Rename methods (6/6)
 2014-08-26 10:09:02 +00:00
RoboErik
0930127614 am dba279ee: am e9b37d06: am 936b1894: Merge "Ensure current volume is current" into lmp-dev 
* commit 'dba279ee1e5ae7a90e8f0693ce929d7ef8bd25ca':
  Ensure current volume is current
 2014-08-26 10:08:14 +00:00
Chulwoo Lee
984d99b584 Fix checking trackId 
BUG: 17261638
Change-Id: I141b7c9de1289c49f29d2f1e1ac534045abb333d
 2014-08-26 11:29:17 +09:00
Jean-Michel Trivi
2d17128f6e SoundPool.Builder: document default values 
Complete javadoc for android.media.SoundPool.Builder to document
 what the default values are.

Bug 17059255

Change-Id: I966e9ed00ed75a78c9b4741b7f68bae996442cdf
 2014-08-25 16:48:24 -07:00
Dongwon Kang
f178c14919 Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 2014-08-25 23:44:34 +00:00
Dongwon Kang
c88b8f8722 TIF: fix NPE when notifyXXX is called on c-tor of Session implementation 
Bug: 17241260
Change-Id: Ib82ed9fb98f13e31cdf70a3bb273384abcf1b33a
 2014-08-26 08:41:40 +09:00
John Spurlock
d38eeb5512 Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 2014-08-25 22:35:25 +00:00
Nancy Chen
e4b1d57dfd Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 2014-08-25 22:24:09 +00:00
John Spurlock
78b8c8fbde QS: Wire up screen casting to tile/panel. 
Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.

Also:
 - Implement hashCode/equals on MediaProjectionInfo
 - Fix unintentional recursion in the service.

Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
 2014-08-25 17:55:08 -04:00
RoboErik
cc3e5d5cd1 Merge "Ensure current volume is current" into lmp-dev 2014-08-25 20:20:54 +00:00
Nancy Chen
0eb1e402c7 API review PhoneManager -> TelecommManager. Rename methods (6/6) 
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I7d573e27ed093f2ddb7849703cc62f9916835393
 2014-08-25 10:50:44 -07:00
Wonsik Kim
2a54a3adea am a7090255: am 44505361: am 0d86a94f: Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 
* commit 'a70902550ec0b0e3120632087e68189172c385d1':
  TIF: define hidden channels columns as @SystemApi
 2014-08-25 08:25:40 +00:00
Wonsik Kim
8d0b268e42 TIF: define hidden channels columns as @SystemApi 
Bug: 17165479
Change-Id: Ic0b0bdbc440eb15e68e4a1a5fa15a4875b17d061
 2014-08-25 14:21:40 +09:00
RoboErik
7e2b3008f1 Ensure current volume is current 
This sets the current volume when a session is switched over to
remote playback. Otherwise it won't be current until it changes and
sends an update.

Change-Id: Iabedb24a34e88308e7e3c56a2b1ab279a17b466b
 2014-08-22 14:39:36 -07:00
Lajos Molnar
f7ac0226b0 am 5a7f49f7: am a66ef2be: am 202c366e: Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 
* commit '5a7f49f715b25c8f6a961dc04768ce1fa10e9899':
  MediaCodeInfo: fix support for feature-can-swap-width-height
 2014-08-22 20:08:36 +00:00
Lajos Molnar
a802e26d08 Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 2014-08-22 19:38:23 +00:00
Jae Seo
256fda4493 am 941070ce: am 5a58383a: am 48ca66c3: Merge "TIF: Fix comments in TvContentRating" into lmp-dev 
* commit '941070ce591ec3de08f9d2675a41a1bb50b6212e':
  TIF: Fix comments in TvContentRating
 2014-08-22 19:07:52 +00:00
Jae Seo
ae06aec9bb Merge "TIF: Fix comments in TvContentRating" into lmp-dev 2014-08-22 18:41:32 +00:00
Jae Seo
ceb51abc74 TIF: Fix comments in TvContentRating 
Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8
 2014-08-22 11:27:10 -07:00
Youngsang Cho
94573f25c7 am fcf625c5: am ef396f9e: am deeb5e37: Merge "Send notification messages immediatelly" into lmp-dev 
* commit 'fcf625c530c95fd64f93d195197590da24a5a79b':
  Send notification messages immediatelly
 2014-08-22 16:24:40 +00:00
Youngsang Cho
e91f83c88e Merge "Send notification messages immediatelly" into lmp-dev 2014-08-22 15:54:12 +00:00