Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,954 Commits 3 Branches 0 Tags
c07db94e2e5e50b03af22fe64b5f289776ecaf20
Commit Graph

124954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vineeta Srivastava
c07db94e2e am d6a263f4: am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'd6a263f46b9050ca0cb8f7743ce38f3ac9c7466d':
  telephony: Add same named operator configuration for some operators
 2014-03-08 01:53:54 +00:00
Chris Craik
400b623209 Merge "Update Z documentation to avoid hidden API" 2014-03-08 01:12:44 +00:00
Chris Craik
29cc47a5f1 Update Z documentation to avoid hidden API 
Change-Id: I723930b951327a06dfbf2aeb8417409e6ce02c2e
 2014-03-07 17:11:26 -08:00
Alan Viverette
4fc5199760 Merge "Update fast scroller item count after layoutChildren()" 2014-03-08 01:00:31 +00:00
Alan Viverette
732ca4642f Update fast scroller item count after layoutChildren() 
BUG: 12553181
Change-Id: I4ea1b45d08c153b0146868bf57884d6b8dde6245
 2014-03-07 16:49:32 -08:00
Xia Wang
6bed599aa7 Merge "Fix state transition verification." 2014-03-08 00:15:53 +00:00
Dianne Hackborn
13305da38b Merge "Start recording wakeup reasons in battery history." 2014-03-08 00:10:15 +00:00
Vineeta Srivastava
d6a263f46b am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '230e20d26815ecc1aea1a4709cd7e188d049360f':
  telephony: Add same named operator configuration for some operators
 2014-03-07 23:39:20 +00:00
Dianne Hackborn
c51cf03cf2 Start recording wakeup reasons in battery history. 
Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel.  These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
 2014-03-07 15:18:45 -08:00
Chris Craik
9edb96b533 Merge "Update tessellation tracing" 2014-03-07 23:12:32 +00:00
Chris Craik
87f9df880e Update tessellation tracing 
Change-Id: I6c73f2467817412d9936dde217df9938a6884003
 2014-03-07 14:34:55 -08:00
Chris Craik
a847fdfdb2 Merge "Fix build, removing hidden attr" 2014-03-07 22:17:02 +00:00
Chris Craik
f481907990 Fix build, removing hidden attr 
Change-Id: Ia820e76345ad6077025e887afdaa91e08eecd649
 2014-03-07 14:15:57 -08:00
Chris Craik
2d70802fec Merge "Hide isolatedZVolume API" 2014-03-07 21:51:56 +00:00
Vineeta Srivastava
230e20d268 am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '5ef72c30847a0b29c35489fef30bc21fe5a5dcfe':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:46:35 +00:00
Vineeta Srivastava
5ef72c3084 am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'f066adde7a3722deba0226715af695537511271e':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:18:47 +00:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:12:17 +00:00
Chris Craik
b3a8b2c823 Hide isolatedZVolume API 
Change-Id: Ia3a70aaac3d7027285a7510d6fed9ca3548a0bf1
 2014-03-07 13:10:30 -08:00
Vineeta Srivastava
e54507910a am 66e9fa99: (-s ours) am b4fd0972: am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit '66e9fa99a09907cf5afae915a6636c56c0f2fb8e':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 20:33:52 +00:00
Mike J. Chen
8169bc78a1 am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev 
* commit '5adbea2e2da3a0af1357de05a04534c65a7c9f76':
  Add handshake broadcast support
 2014-03-07 20:33:46 +00:00
Leon Scroggins III
695d169e42 am dbc7a465: (-s ours) am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'dbc7a4653f2a50863788bef0c3ac67acc35fc5ab':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 20:33:37 +00:00
Dianne Hackborn
1fb6b9557e am 38d12b07: (-s ours) am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '38d12b07e7483764749359a6f5aaebbf13d99f39':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 20:33:35 +00:00
Andy McFadden
80af2fc5c6 am 43cd1d87: am ae6bd610: am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '43cd1d87261dad595ed8bde271f1202cc7e5855d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 20:33:27 +00:00
Narayan Kamath
e78a747d35 am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
  Don't assume that size_t is 32-bit
 2014-03-07 20:22:15 +00:00
Narayan Kamath
6ae7cd063b am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit 'f2c11c142975f1571a0e8606a3b274afcb987b83':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 20:22:13 +00:00
Narayan Kamath
11d9e512eb am 3c9c67ae: (-s ours) am ca35c18a: am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit '3c9c67ae666312070ddfb4d3aca1c0add708d056':
  Inform libcore of time format pref. changes.
 2014-03-07 20:22:10 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Chris Wren
e29c1ebd88 resolved conflicts for merge of 2f03cbe6 to master 
Change-Id: I3a11aa9e8e2228cfbb15900f2acaf062dd2660c5
 2014-03-07 15:04:11 -05:00
Jeff Brown
71c8fb92a1 am 2b27ef97: am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit '2b27ef979dba3808cdae6dce32fe27b59197e34c':
  Add config_supportAutoRotation.
 2014-03-07 19:29:48 +00:00
Jeff Brown
2d6413a294 am 0b93d86b: am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '0b93d86bf4ab4a0ff2606af881d8bf4aaa8ce9b2':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 19:29:43 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators 
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
 2014-03-07 11:29:18 -08:00
Vineeta Srivastava
66e9fa99a0 am b4fd0972: am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'b4fd09725b228e2d73518ce06ba413f838e002df':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:54:58 +00:00
John Spurlock
668fd22690 Merge "Tweaks to zen mode shade UI." 2014-03-07 18:54:06 +00:00
Mike J. Chen
5adbea2e2d am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev 
* commit '784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78':
  Add handshake broadcast support
 2014-03-07 18:50:54 +00:00
Vineeta Srivastava
b4fd09725b am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit '16ed831eb391e1d08050c52579f316ed5505c1e8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:48:17 +00:00
Vineeta Srivastava
16ed831eb3 am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit '3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:45:11 +00:00
Mike J. Chen
784224d2f9 am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev 
* commit 'b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad':
  Add handshake broadcast support
 2014-03-07 18:44:22 +00:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:40:53 +00:00
Mike J. Chen
b8a7dd639e Merge "Add handshake broadcast support" into klp-modular-dev 2014-03-07 18:40:23 +00:00
George Mount
daeb393618 Merge "Fix problem with Animators pausing the wrong Window." 2014-03-07 18:39:35 +00:00
John Spurlock
679fca5504 Tweaks to zen mode shade UI. 
Haptic feedback when shade is unlatched, and don't commit to expansion
until gesture up.

Bug:13359710
Change-Id: I128afc15c01478f643400da8b96679fcf1c89bf2
 2014-03-07 13:38:09 -05:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE] 
This reverts commit 119e24f987.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
 2014-03-07 18:37:26 +00:00
Leon Scroggins III
dbc7a4653f am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '757ab3e6df3f884b7ea36ae021c886513a2ce2ca':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:25:32 +00:00
Dianne Hackborn
38d12b07e7 am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit 'a6947c418129acc0815aac8aee86be0db5360232':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:25:29 +00:00
Leon Scroggins III
757ab3e6df am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '48df72f7db7456304bde16a6f000fd7d45ba5d13':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:21:54 +00:00
Dianne Hackborn
a6947c4181 am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '045ed665197ed3ba0681db173a058a55662cd16a':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:21:52 +00:00
Leon Scroggins III
48df72f7db am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:18:35 +00:00
Dianne Hackborn
045ed66519 am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:18:31 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:15:23 +00:00