Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,129 Commits 3 Branches 0 Tags
a1b84b5ee7ba975bd2dbccb41d43597d96a07fc0
Commit Graph

3334 Commits

Author SHA1 Message Date
Marco Nelissen
cddd127d7f am 95b9d04d: am d3a62f1b: am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '95b9d04d74e47f4e13ad6941155d2227767ff026':
  Also consider secondary storage when verifying paths
 2014-10-16 18:12:52 +00:00
John Spurlock
382fa09178 am d20db283: am c824a9d4: am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'd20db2832ee868212546d386e5652c09ffd29dc4':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 07:00:28 +00:00
Marco Nelissen
4683a10f9c am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
 2014-10-16 00:41:10 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-15 23:40:07 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate). 
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
 2014-10-15 13:32:31 -04:00
Chong Zhang
582570a78e am 67253051: am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit '672530513782944d7271f880679f751c2d618d15':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-10 18:41:07 +00:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:11:11 +00:00
Chong Zhang
a6ae8ba4a5 MediaHTTPConnection: do not use proxy for localhost 
Bug: 17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
 2014-10-09 02:07:40 +00:00
Jon Eklund
cb13564554 am 318f0fe4: AudioService: Fix monitorRotation for landscape applications 
* commit '318f0fe43bdc4b2f6764edd91d6b78d9875ffdeb':
  AudioService: Fix monitorRotation for landscape applications
 2014-10-08 18:15:42 +00:00
Jon Eklund
318f0fe43b AudioService: Fix monitorRotation for landscape applications 
Current implmentation only sends rotation updates on orientation
changes, so does not handle direct 0<->180 or 90<->270 transitions.

Update rotation based on an OrientationEventListener instead of
Intent.ACTION_CONFIGURATION_CHANGED

Bug 17606902

Change-Id: I01dfcd1c587f5b2e8a96365c2389782ad77936ef
 2014-10-08 01:06:15 +00:00
Jean-Michel Trivi
1de4c890d7 am 5d0ac190: am 993b533a: am 63b6d3ed: am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit '5d0ac1907bb3e763f547ad081302f489cc099d2e':
  Full volume on remote submix for apps that need it
 2014-10-07 18:07:35 +00:00
Jean-Michel Trivi
5d0ac1907b am 993b533a: am 63b6d3ed: am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit '993b533a609ee72ebb3b99284953f8c801d5f2cf':
  Full volume on remote submix for apps that need it
 2014-10-07 18:02:21 +00:00
Jean-Michel Trivi
986468a8ab am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
  Full volume on remote submix for apps that need it
 2014-10-07 17:33:05 +00:00
Jean-Michel Trivi
ba5270b887 Full volume on remote submix for apps that need it 
If an AudioRecord is created with the "fixedVolume" tag
  when recording from REMOTE_SUBMIX, treat the
  device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
  device during the recording. Also register a death
  handler during the recording.
  Otherwise this is a no-op.

Bug 17635294

Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
 2014-10-07 09:09:41 -07:00
Benson Huang
392188f063 am 6ad95c30: am 37fa980c: am 1e62e476: am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit '6ad95c301c7dbc48378e780a9bc84add2849770e':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 19:08:51 +00:00
Benson Huang
6ad95c301c am 37fa980c: am 1e62e476: am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit '37fa980c55c1b5fab84110eb0355cffbae74a692':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 19:03:38 +00:00
Benson Huang
ce4483cb83 [FM] Add FM_TUNER audio source to support L version FM radio app 
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
    2.AudioRecord.java: For FM output to the other device,
     (except the headset case), record the FM tuner signal to a track
      and playback the recorded signal by a track.
    3.AudioAttributes.java: Thus we use AudioRecord, need to modify
      setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.

    Review: https://partner-android-review.git.corp.google.com/#/c/182071

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
 2014-10-06 18:50:12 +00:00
RoboErik
021b51fa28 am 64cb3ec4: am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '64cb3ec43209e61a63b79a227cd00f848ef1bddb':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:59:36 +00:00
RoboErik
64cb3ec432 am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '26c2e5a0de022e3842e65337550214c7133aa08b':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:52:37 +00:00
RoboErik
51c07bc0bf Fix regression in RCC.editMetadata(false) 
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.

bug:17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
 2014-10-03 12:45:58 -07:00
Glenn Kasten
e613a1d530 am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp 
* commit '1d6ca80ed6a27e324e52b8b944ef64dc07a92e34':
  AudioService: Fix monitorRotation for landscape applications
 2014-10-02 17:38:08 +00:00
Glenn Kasten
1d6ca80ed6 resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp 
Change-Id: Id873ccdfa1b9d9c157d1e1d00dcd2a980b55c386
 2014-10-02 10:18:00 -07:00
Sungsoo Lim
92932a45ef am 52ecadbf: am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit '52ecadbf8c50838c31807a1581faaf8ae5b10fd3':
  Update java doc for content rating systems
 2014-10-01 22:13:06 +00:00
Sungsoo Lim
d3f17921bd Update java doc for content rating systems 
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.

Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
 2014-10-01 09:41:51 +09:00
Yao Chen
7fe33786d6 am ff3796bd: am d4895aa0: am b0def77c: am 3f544e0b: am 31f80f0f: Assign bindService() result to a boolean directly. One less if-else 
* commit 'ff3796bd875d259ba5a0edf7994ff02faecebc05':
  Assign bindService() result to a boolean directly. One less if-else
 2014-09-29 19:47:17 +00:00
Marco Nelissen
664d4c64b6 am fa1f0380: am 13d7d40c: am 83c23dda: am c8db4536: am 7e51102c: Merge "Validate MTP path" into lmp-dev 
* commit 'fa1f03801ea98b32d172e2129dd9e1de6990e404':
  Validate MTP path
 2014-09-29 19:47:10 +00:00
RoboErik
95cf034365 am 66aec18a: am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '66aec18ad3ce02f13ad162f3c0edd73f648a316c':
  Don't forward media keys to the app if the phone session is active
 2014-09-29 19:46:10 +00:00
Yao Chen
c8a3e0dc9d Assign bindService() result to a boolean directly. One less if-else 
Bug: 17637058
Change-Id: If2f4db2ebf95f1912a752794a1ab482cf30ab014
 2014-09-27 01:08:39 +00:00
Marco Nelissen
f8c4f9efcb Merge "Validate MTP path" into lmp-dev 2014-09-27 01:03:50 +00:00
Marco Nelissen
5f411696a6 Validate MTP path 
Bug: 17673184
Change-Id: I51a64f065d9b3609557af81e596ebeb8720ab6c5
 2014-09-26 16:07:49 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active 
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
 2014-09-26 14:53:06 -07:00
RoboErik
7cf4a1e689 am 594858c9: am 765ef814: am 5120438b: am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '594858c9d5b7c93bb0c70928c27fb4381fcb0226':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 21:03:17 +00:00
RoboErik
92c622ef82 am 22069b65: am 3c99bd4b: am 298314cb: am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '22069b6592c821487fc024b59e103c39fa4bbd34':
  Remove BT routes when BT is turned off
 2014-09-26 21:03:12 +00:00
Yao Chen
babfa52acb am 1fe66b74: am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 
* commit '1fe66b74b60921b15e8fd1125d4ad79cf65aef0e':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
 2014-09-26 19:43:26 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
RoboErik
f5085b518c am 90b89adb: am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 
* commit '90b89adb01087fbaae7ac6499b95dc085b02a531':
  Ensure MediaBrowser state is set to connecting after a reconnect
 2014-09-26 15:26:00 +00:00
RoboErik
4932877113 am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit '00cbb751533bf683480ba80f0c450c59c6ca96a1':
  Allow null queues to be set in MediaSession
 2014-09-26 15:25:55 +00:00
RoboErik
1dc5ba8665 Disable MediaSessionLegacyHelper debugging 
Switched over to using Log.isLoggable instead for release.

Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
 2014-09-25 14:57:35 -07:00
RoboErik
5535ea8ef8 Remove BT routes when BT is turned off 
A behavior change in the BT stack caused it to stop sending connection
changes for connected devices when you turn BT off. To work around this
we need to remove the connected BT route when BT is turned off.

bug:17512270
Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
 2014-09-25 14:57:35 -07:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
Ronghua Wu
bf957c2fb5 am 0a84c4c9: am bf14a4e6: am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '0a84c4c9ad2c62b788047e762ef73ca0623e4a0a':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 17:18:59 +00:00
Lajos Molnar
0677a41661 am 11148f96: am a91920f0: am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit '11148f9683a0eec69101d87177d69d96ce944d92':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 17:18:49 +00:00
Lajos Molnar
b2fe00034d am 4d53a61b: am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '4d53a61b6636dcc4be7089daef59a159d567636a':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 17:18:36 +00:00
Ruben Brunk
4656e6bb16 am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:35:00 +00:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00