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

119455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
544d696576 am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-11 18:28:41 +00:00
Tim Murray
e1b6ab427c am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc':
  Fix null check for BaseObj.equals.
 2014-03-11 18:28:31 +00:00
Ying Wang
c9f8aa0cb4 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
 2014-03-11 18:17:41 +00:00
Nick Kralevich
968173968f am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '787d81453ce1e5451bd2c289c8b53cfeda2eab29':
  Fix descriptor leak after accepting connections
 2014-03-11 18:17:17 +00:00
Narayan Kamath
2d895e6344 am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-03-11 18:16:59 +00:00
Narayan Kamath
3489aa9a0d am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit 'd138029d92e1d4657815747f30004323061d34de':
  AArch64: Use long[] for RS id array
 2014-03-11 18:16:52 +00:00
Xavier Ducrohet
1767ea649c am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
 2014-03-11 18:16:42 +00:00
Christopher Tate
3b0b00c62d am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application" 
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
  Fixed upgrading from forward-lock application to system application
 2014-03-11 18:16:38 +00:00
Narayan Kamath
30420d58e2 am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-03-11 18:16:20 +00:00
Narayan Kamath
9a25b94430 am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
 2014-03-11 18:16:17 +00:00
Chris Craik
71be6865b9 am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '59ff85af314e2984068943f5572ac40ef381edea':
  Fix AOSP build - DO NOT MERGE
 2014-03-11 18:08:14 +00:00
Chris Craik
fa03b57295 am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
  Fix graphics corruption caused by HWUI caches
 2014-03-11 18:08:10 +00:00
Chad Brubaker
a1d7c74449 Remove SO_BINDTODEVICE from VPN protect 
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
 2014-03-11 10:58:19 -07:00
Chad Brubaker
674f85af4c Merge "Only allow System apps to make VPN exempt routes" into klp-dev 2014-03-11 17:51:50 +00:00
Chad Brubaker
decfd7079b Merge "Add the calling package name to requestRouteToHost" into klp-dev 2014-03-11 17:51:45 +00:00
Christopher Tate
87503f8561 am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'e9821bf2380bfa325e6398a6390a4083007d3006':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-11 17:37:06 +00:00
Baligh Uddin
c6ccb8a3d4 am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7138395b26fcad9664ad05b9c98109f60db8a557':
  Import translations. DO NOT MERGE
 2014-03-11 17:37:03 +00:00
Christopher Tate
e9821bf238 Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev 2014-03-11 17:34:15 +00:00
Baligh Uddin
7138395b26 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:33:28 +00:00
Narayan Kamath
b071a07da8 am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'a79af3647f7f93825b84cc25187527b5aac60a69':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 08:14:26 -07:00
Narayan Kamath
a79af3647f Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 2014-03-11 15:09:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again). 
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
 2014-03-11 15:02:10 +00:00
Narayan Kamath
194e77aafe am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.
 2014-03-11 05:03:36 -07:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Alan Viverette
9ebe031cdc am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '6e6dc23c692b14f5e70ee1453eab726978e4984e':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-11 02:15:26 +00:00
Alan Viverette
7b09a4e5df am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'e910a7ce8b42580b8bc184dfc340859a65e98c80':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-11 02:15:24 +00:00
Alan Viverette
3c3377a229 am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 02:15:21 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
75958c2984 am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '3a153c0de271a004710e5ac545c48778f7e51b12':
  Fix a bug in submenu presenter priority handling
 2014-03-11 01:24:47 +00:00
Adam Powell
3a153c0de2 Merge "Fix a bug in submenu presenter priority handling" into klp-dev 2014-03-11 01:22:10 +00:00
Jason Sams
780d57b81a am cf8573c1: Fix destruction issues relating to AllocationAdapter. 
* commit 'cf8573c15456c4581b691c7380722ea6dccf11c5':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:32 +00:00
Jason Sams
e14d5e9011 am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '5757bf89c44e7a4805340b5634bec13a1caf39f8':
  Add hidden minor version ID for support lib workarounds.
 2014-03-11 01:12:29 +00:00
Jason Sams
0165db3802 am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit 'ff7256e757502279b1777127a12eba235be679ae':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:23 +00:00
Christopher Tate
4bda43777c DO NOT MERGE - Don't hang installs if the transport disappears 
Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
 2014-03-10 18:07:12 -07:00
Narayan Kamath
3ba975e75d am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-03-11 00:53:11 +00:00
Narayan Kamath
5bf28c1ec8 am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
 2014-03-11 00:53:08 +00:00
Jeff Brown
fc7315c6c1 am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '6d71e165ba961251f0705b75aafed74eba1bc570':
  Round off when calculate next step in Seekbar
 2014-03-10 17:11:57 -07:00
Jeff Brown
33282d6615 am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12':
  Fixed typo errors in documentation
 2014-03-10 17:08:27 -07:00
Jeff Brown
aaf23a9a65 am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07':
  Hang off call by power button while screen is on
 2014-03-10 17:08:24 -07:00
Jeff Brown
e7f7af964b am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
  take account of RotationVector's new extra parameter
 2014-03-10 17:08:21 -07:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
c3f5d69432 Merge "Hang off call by power button while screen is on" 2014-03-11 00:06:01 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
Mike Lockwood
fbd5521fb5 UsbDeviceManager: Fix race condition between accessory start and USB configured uevents 
Bug: 13393825
Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
 2014-03-10 15:58:11 -07:00
Katie McCormick
07c0ad973a Merge "Doc update: new doc studio layout editor" into klp-docs 2014-03-10 21:51:32 +00:00
John Spurlock
f6228d95ea Merge "Fix doc typos in AppOpsManager.java" into klp-docs 2014-03-10 21:42:37 +00:00