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

146406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
0462468aaf Make scan filter accepts prefix. Add tests. 
Change-Id: I714dd6d95ad2bc874dce1106b325762b19159119
 2014-07-28 21:46:44 -07:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Riley Andrews
4789e41a9f Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev 2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2 Add cursor flags into SpriteController to suppor async cursor updates. 
- This is fairly blindly taken from nvidia's implementation.

Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
 2014-07-28 22:04:06 +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
Winson Chung
b1b191ad66 Merge "Updating lock-to-app look." into lmp-dev 2014-07-25 21:16:23 +00:00
Winson Chung
2915b9d148 Updating lock-to-app look. 
- Adding seek bars for tweaking values when in debug mode

Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
 2014-07-28 22:26:36 +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
Christopher Tate
7f25081a4d Merge "Provide outside-facing API for data management intent+label" into lmp-dev 2014-07-27 22:35:46 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo 
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
 2014-07-28 06:57:04 +09:00
Jinsuk Kim
8c688ada2d MHL controller for subcommand reception 
Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
 2014-07-26 08:14:08 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay 
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
 2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed. 
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
 2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539 Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540) 2014-07-25 22:47:33 +00:00
Baligh Uddin
95c58ed763 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 15:37:54 +00:00
Baligh Uddin
c9c3a9c9db Import translations. DO NOT MERGE 
Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b
Auto-generated-cl: translation import
 2014-07-28 23:12:12 +00:00
Mike Lockwood
9e61436424 Merge "android.media.AudioPatch: update comment" into lmp-dev 2014-07-24 15:36:21 +00:00
Mike Lockwood
31b2d8ee43 android.media.AudioPatch: update comment 
Change-Id: Ic5470c49be4b4f4dcda8db8f2d1153afe2e84ad1
 2014-07-28 14:40:12 -07: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
d92e726cbe Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b Revert "Load the WebView Java code from an APK." DO NOT MERGE 
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724
 2014-07-28 21:07:24 +01:00
John Spurlock
e2efefe19d QS: Allow hotspot tile on secure keyguard. 
Bug:16234190
Change-Id: I82a724e46f0a6ddd5c719742ef9c4f86feb791dc
 2014-07-28 11:20:29 -04:00
Adrian Roos
e32dac8ff1 Update KeyguardStatusView on user and alarm changes 
Refreshes both owner info and the next alarm when
the current user changes. Also updates the next
alarm when it changes.

Bug: 16531212
Change-Id: Ibc9de5d28b2cafd6946fc56602f12769d3526728
 2014-07-28 17:02:59 +02:00
Bo Liu
590b8d3601 Merge "Add kModeSync" into lmp-dev 2014-07-24 20:48:02 +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
vandwalle
57188b8908 Merge "introduce WifiConnectionstatistics" into lmp-dev 2014-07-28 18:28:56 +00:00
vandwalle
4eeecb2550 introduce WifiConnectionstatistics 
This CL is dependent on I10584a447fecd977df3eefd8e2cc028bd26ec0e3

Change-Id: I51fbbf062feb22c5f16b438675519064cc43e160
 2014-07-28 21:20:55 +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
George Mount
a7dc1702af Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 2014-07-28 18:28:56 +00:00
George Mount
2cacfe3a98 Allow changing bounds to and from a zero-sized bounds. 
Bug 14590183

Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
 2014-07-28 14:54:23 +00:00
Yao Chen
c2c0bdc10a Merge "s/thumbnail/icon in the browsing api." into lmp-dev 2014-07-24 20:48:02 +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
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
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
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
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Yao Chen
5f3e1f2a2d s/thumbnail/icon in the browsing api. 
Change-Id: I73bf76ed9628872094db74aef48a8e68864d6b4d
 2014-07-28 11:35:36 -07:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +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