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

146622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
9cac98a4ab am 1a6982e0: Fix QS overscroll flickering 
* commit '1a6982e056f484cf3c4ceca7a1f445779d2560bc':
  Fix QS overscroll flickering
 2014-07-28 20:47:19 +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
George Mount
d17ac54df3 Fix slide edge constants to match the gravity values. 
Bug 16544683

Change-Id: If9aeb585d5c3eb3a984288c09510e1dde0c03045
 2014-07-28 20:37:24 +00:00
Selim Gurun
5f6aaa8d2e am 73433d3b: Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 
* commit '73433d3b56e0b8f3803ed6747f00e22462fd6410':
  Revert "Load the WebView Java code from an APK." DO NOT MERGE
 2014-07-28 20:28:54 +00:00
Yao Chen
c49f36c9ee am 920a5b7b: Merge "s/thumbnail/icon in the browsing api." into lmp-dev 
* commit '920a5b7b1a3e9c19dcbe87c12d01659258e2805d':
  s/thumbnail/icon in the browsing api.
 2014-07-28 20:28:50 +00:00
Eino-Ville Talvala
e291363137 am c9e436f5: Camera2: CameraManager refurbishing and error management 
* commit 'c9e436f543f1c793024a98a602894865869af808':
  Camera2: CameraManager refurbishing and error management
 2014-07-28 20:24:11 +00:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management 
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
 2014-07-28 20:21:12 +00:00
Alan Lau
8a5d7fa3c2 am c7888432: am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit 'c7888432e922de0801b088ec7a9335a01175524c':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:16:17 +00:00
Bo Liu
f2553b13cd am 7a286b09: Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 
* commit '7a286b0955c718db106de3cafb3741bf9a6e666a':
  Add WebView.enableSlowWholeDocumentDraw
 2014-07-28 20:16:12 +00:00
Alan Lau
c9c70a830a am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '52baf3d096ae72de4264183d26465a90bba2550a':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:11:39 +00:00
Alan Lau
6a4018bc35 am 691b38c0: am d2e1ecb6: (-s ours) am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '691b38c0bacacbb9635a3a94f3fa64b40b87411c':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 20:07:46 +00:00
Alan Lau
68afa6ff0e am ed4d5218: am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'ed4d5218a94b7f14940301ceaafbf6e8fcd9bb83':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 20:07:42 +00:00
Jorim Jaggi
abbed0940a am 98cbea21: Update alarm icon in status bar. 
* commit '98cbea21760467d9f4b9f1d584ab0b0b232150b3':
  Update alarm icon in status bar.
 2014-07-28 20:07:36 +00:00
Anish Athalye
450fbf3805 am d39adfb5: am a665380b: (-s ours) am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit 'd39adfb5f785ebbdeb46f7b4c09b22ae83eb24fc':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 20:07:32 +00:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
38ff6a25c8 am d2e1ecb6: (-s ours) am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit 'd2e1ecb67bbb7fc5ae7f076ae5acec5d06a5c378':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 20:03:40 +00:00
Alan Lau
e7a11f9e40 am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit '18b5f44c5eca22791c701d02bf7525c6bfd5aec3':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 20:03:37 +00:00
George Mount
d27cc30409 am 89f2152f: Make returning ActivityOptions part of ActivityRecord. 
* commit '89f2152fc4c7886fb9c420964ec98501131e6774':
  Make returning ActivityOptions part of ActivityRecord.
 2014-07-28 20:03:09 +00:00
Jorim Jaggi
02609c1d48 Update alarm icon in status bar. 
Now that we have new icons on Keyguard and QS, update it to the same
icon in status bar as well.

Change-Id: I87831a18b51719bb2b90b2198597ae20f61f8bb5
 2014-07-28 20:01:10 +00:00
Anish Athalye
761cf8010f am a665380b: (-s ours) am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit 'a665380b60de8900edca233848b556c123eb2e03':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:59:27 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00