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

146791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
eef7f32868 am 76f7ff76: am 2649acb4: rename AudioSystem::newAudioSessionId() 
* commit '76f7ff767c6b0e38d72698a12df45a61205b4658':
  rename AudioSystem::newAudioSessionId()
 2014-07-28 23:15:55 +00:00
Yin-Chia Yeh
abb2f3eddb am 4bcca6fc: am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit '4bcca6fc3b49a6839300d02e3c149f592e51d3a7':
  Camera2: Fix wrong usage of toArray
 2014-07-28 23:15:45 +00:00
Robert Greenwalt
ec9af952b0 am 0431375e: am 1829b111: Merge "Remove dead code 2." into lmp-dev 
* commit '0431375e7e7f7ca5254fdb37b53df002a9c0ec80':
  Remove dead code 2.
 2014-07-28 23:15:41 +00:00
Jinsuk Kim
3a6de8c605 am c6a4ac34: Merge "Add MHL getPortInfo" into lmp-dev 
* commit 'c6a4ac34865c844a30fe9836c264d0da1688e9db':
  Add MHL getPortInfo
 2014-07-28 23:15:35 +00:00
Baligh Uddin
df84404d58 Import translations. DO NOT MERGE 
Change-Id: I1fcd1e840d7fbcc47d41e1dc997b685b6c4b9205
Auto-generated-cl: translation import
 2014-07-28 23:12:31 +00:00
Jing Zhao
1a7cd95f59 am 2d6cea4b: am 7e0d8f1f: Enable config CDMA home system by mcc mnc 
* commit '2d6cea4b919015365477be8d1d48214ca2b546ac':
  Enable config CDMA home system by mcc mnc
 2014-07-28 22:53:34 +00:00
Eric Laurent
a6143a974a am 2649acb4: rename AudioSystem::newAudioSessionId() 
* commit '2649acb4fcbf59c29b55916b5bf7237157a21ffa':
  rename AudioSystem::newAudioSessionId()
 2014-07-28 22:47:45 +00:00
Yin-Chia Yeh
478db221eb am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit '9c65a371063acb6fff6c23e695b06c20ce943b54':
  Camera2: Fix wrong usage of toArray
 2014-07-28 22:47:34 +00:00
Robert Greenwalt
b71748552c am 1829b111: Merge "Remove dead code 2." into lmp-dev 
* commit '1829b111f11c2813488e427c3505d5cbf7c96597':
  Remove dead code 2.
 2014-07-28 22:47:29 +00:00
Ying Wang
8b5a858ee3 Merge "Fix docs build." into lmp-dev 2014-07-28 22:45:16 +00:00
Ying Wang
546f3bf5fe Fix docs build. 
Change-Id: I735f5b5a3fe36a454e384d5060d9273a9aabf3aa
 2014-07-29 16:23:15 -07:00
Robert Shih
05ad96e9a3 Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev 2014-07-28 22:45:16 +00:00
Robert Shih
c42a96dba4 MediaPlayer: scanInternalSubtitleTracks in synchronous prepare 
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
 2014-07-29 11:55:46 -07:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling 
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
 2014-07-29 12:49:50 -07:00
Matthew Williams
94703148bc Merge "remove possible JobScheduler race in cancel()" into lmp-dev 2014-07-28 22:45:16 +00:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel() 
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
 2014-07-29 11:11:41 -07:00
Adam Lesinski
ae9e68a349 Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
b5b3a1d30b Merge "Fix capitalization on AudioPort callback method names" into lmp-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
fdaed9dcb6 Fix capitalization on AudioPort callback method names 
Change-Id: I87963ea7290989333781bf8905c9ae640c34d943
 2014-07-29 09:30:34 -07:00
Robert Ly
1c977b3744 Merge "docs: fix typo bug 16623189" into klp-modular-docs 2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde docs: fix typo bug 16623189 
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
 2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
62dc1768d6 rename AudioSystem::newAudioSessionId() 
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.

Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
 2014-07-28 22:21:46 +00:00
Jing Zhao
6ac5779c78 am 7e0d8f1f: Enable config CDMA home system by mcc mnc 
* commit '7e0d8f1f638aeb64a57138b3b6353ff326c5ee02':
  Enable config CDMA home system by mcc mnc
 2014-07-28 22:02:56 +00:00
Mike Lockwood
e5e2ad6418 am e2d874c3: am 32a80627: Merge "android.media.AudioPatch: update comment" into lmp-dev 
* commit 'e2d874c321c9a5af3c95f397a08567071df63f59':
  android.media.AudioPatch: update comment
 2014-07-28 22:00:49 +00:00
Bo Liu
f04b2f25b3 am b9866e91: am e82c63e0: Merge "Add kModeSync" into lmp-dev 
* commit 'b9866e91f156bd18f7dcab7d41f5d4e66609e153':
  Add kModeSync
 2014-07-28 22:00:44 +00:00
Christopher Tate
6dc576b0ee am e1ec86ef: am a2472304: Add data-management intent + label to BackupTransport API 
* commit 'e1ec86ef640c303407ee9c311e3a31597057ffa0':
  Add data-management intent + label to BackupTransport API
 2014-07-28 22:00:40 +00:00
Jean-Michel Trivi
9decc9f36c am f5b404c6: am 6b1a3fdd: AudioAttributes and AudioRecord. 
* commit 'f5b404c6f6c0be796fe28559822d0fb62d1a5145':
  AudioAttributes and AudioRecord.
 2014-07-28 22:00:35 +00:00
vandwalle
e1a4eff3a2 am 85e95111: am 4c187fcc: Merge "introduce WifiConnectionstatistics" into lmp-dev 
* commit '85e951114a6ad0a222bc663f1c339c37729fbdfa':
  introduce WifiConnectionstatistics
 2014-07-28 22:00:29 +00:00
Mike Lockwood
1fd78d83e5 am 32a80627: Merge "android.media.AudioPatch: update comment" into lmp-dev 
* commit '32a80627ccf254e8e43bad847875bd649b15f853':
  android.media.AudioPatch: update comment
 2014-07-28 21:55:49 +00:00
Bo Liu
71c001cc29 am e82c63e0: Merge "Add kModeSync" into lmp-dev 
* commit 'e82c63e08a1c660bf7a3d3b14288998b44506962':
  Add kModeSync
 2014-07-28 21:55:44 +00:00
Christopher Tate
8497f42e4f am a2472304: Add data-management intent + label to BackupTransport API 
* commit 'a2472304dc0a87060215bb930d4ed63242686168':
  Add data-management intent + label to BackupTransport API
 2014-07-28 21:55:35 +00:00
Jean-Michel Trivi
a4f808a4ec am 6b1a3fdd: AudioAttributes and AudioRecord. 
* commit '6b1a3fdde2a2111631a6bd6bd19ef751685b1ffd':
  AudioAttributes and AudioRecord.
 2014-07-28 21:55:31 +00:00
vandwalle
a1aa11e082 am 4c187fcc: Merge "introduce WifiConnectionstatistics" into lmp-dev 
* commit '4c187fcc207255106bcb64c71b8f49d8e6583c9b':
  introduce WifiConnectionstatistics
 2014-07-28 21:55:26 +00:00
Jing Zhao
03cab4cbe6 Enable config CDMA home system by mcc mnc 
Define CDMA home system IDs for Verizon

Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
 2014-07-28 21:53:52 +00:00
Craig Mautner
c1bfc3f066 am 99f8774a: am cdc00db0: Make affiliatedTaskId public and unhidden. 
* commit '99f8774a538bfaca715e8c11dbd07b864d96e828':
  Make affiliatedTaskId public and unhidden.
 2014-07-28 21:52:12 +00:00
George Mount
c30b450f5c am d35a7390: am 2c479d80: Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 
* commit 'd35a739002841aa9f543ae5d3c40a6e04f45dddf':
  Allow changing bounds to and from a zero-sized bounds.
 2014-07-28 21:52:06 +00:00
Christopher Tate
9679410db5 Add data-management intent + label to BackupTransport API 
Bug 16346320

Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
 2014-07-28 21:33:15 +00:00
Jean-Michel Trivi
701d6ff12f AudioAttributes and AudioRecord. 
Add audio recording source in AudioAttributes.
New AudioRecord constructor with AudioAttributes and
  AudioFormat.
Legacy AudioRecord constructor is calling into the new
  constructor.

Bug 16009464

Change-Id: I69d81f9e71bdf946c4cfbda6d3d8552ffac6b5c2
 2014-07-28 21:30:13 +00:00
Craig Mautner
655aeff10c am cdc00db0: Make affiliatedTaskId public and unhidden. 
* commit 'cdc00db0c3313c8ebd9266c62063df5d3f2eb87f':
  Make affiliatedTaskId public and unhidden.
 2014-07-28 21:13:44 +00:00
George Mount
1b095f7efc am 2c479d80: Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 
* commit '2c479d809d2a8b52465cfa1a8e9264388d40257f':
  Allow changing bounds to and from a zero-sized bounds.
 2014-07-28 21:13:38 +00:00
Craig Mautner
22132d7950 Make affiliatedTaskId public and unhidden. 
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().

Fixes bug 16546323.

Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
 2014-07-28 21:10:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack. 
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
 2014-07-28 14:00:35 -07:00
Jorim Jaggi
181cde180e am 2d34140d: am 1a6982e0: Fix QS overscroll flickering 
* commit '2d34140d9d09a3ff790fbc76ef453108790416a6':
  Fix QS overscroll flickering
 2014-07-28 20:54:06 +00:00
Jorim Jaggi
9cac98a4ab am 1a6982e0: Fix QS overscroll flickering 
* commit '1a6982e056f484cf3c4ceca7a1f445779d2560bc':
  Fix QS overscroll flickering
 2014-07-28 20:47:19 +00:00
George Mount
d05940c38e am a980c6b8: am 3b005c08: Fix slide edge constants to match the gravity values. 
* commit 'a980c6b891858365a86bb6a88dc7e3a45677e9f7':
  Fix slide edge constants to match the gravity values.
 2014-07-28 20:45:53 +00:00
George Mount
65d5b6bcd9 am 3b005c08: Fix slide edge constants to match the gravity values. 
* commit '3b005c08f27690fbc528d5ded9d3aa6e0b369ece':
  Fix slide edge constants to match the gravity values.
 2014-07-28 20:41:28 +00:00
Jorim Jaggi
ab71126576 Fix QS overscroll flickering 
Change-Id: I7f514285ec8de185e6f443d6943f0bd711dcac26
 2014-07-28 20:38:32 +00:00