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

125172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Chris Craik
87f9df880e Update tessellation tracing 
Change-Id: I6c73f2467817412d9936dde217df9938a6884003
 2014-03-07 14:34:55 -08:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Dave Allison
3fc3b9fd1b Merge "ART profiler usage." 2014-03-07 22:25:43 +00: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
Jeff Brown
01b5e765e5 Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 2014-03-07 22:15:08 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2014-03-07 14:10:52 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP. 
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
 2014-03-07 14:02:55 -08:00
Chris Craik
2d70802fec Merge "Hide isolatedZVolume API" 2014-03-07 21:51:56 +00:00
Marco Nelissen
8e70165017 am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '344251969929dcb37a33a3e3910121458f7dc38f':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:46:38 +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
Marco Nelissen
3442519699 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:18:52 +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
Marco Nelissen
ac87587875 am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:12:21 +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
Dave Allison
0efbd9a463 ART profiler usage. 
This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal().  This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
	core/jni/AndroidRuntime.cpp
 2014-03-07 12:32:44 -08:00
Marco Nelissen
9823a170e4 Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 2014-03-07 20:23:29 +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 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
 2014-03-07 18:37:26 +00:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08: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