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

124165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
7d99b5a4e1 am 8395aadb: (-s ours) am 860ac9e4: am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '8395aadbd3b2a11fac664f44c590576141c78615':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:36:45 +00:00
Robert Greenwalt
8395aadbd3 am 860ac9e4: am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '860ac9e45f496604757cb27f248def98878f82bb':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:33:28 +00:00
Robert Greenwalt
860ac9e45f am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '41c684a7b5602991cb1af63b2bcaa4e41812dfb9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:29:25 +00:00
Robert Greenwalt
41c684a7b5 am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '0d39ef72112972dfadd70ef14c733672e4a2d646':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:25:11 +00:00
Robert Greenwalt
0d39ef7211 am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:21:50 +00:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:09:13 -08:00
Hui Lu
d22f23b2d6 am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:03:07 +00:00
Hui Lu
fcf7d3a649 am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'eeb291b7f36d63c3db467cc7f4be61af09aa3171':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:00:05 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Baligh Uddin
e794dd5c52 Merge "Import translations. DO NOT MERGE" 2014-02-25 17:16:07 +00:00
Baligh Uddin
dfbd5b750f Merge "Import translations. DO NOT MERGE" 2014-02-25 17:04:44 +00:00
John Spurlock
737eb4d867 Merge "Remove unused animations." 2014-02-25 16:46:34 +00:00
John Spurlock
81de6716a5 Remove unused animations. 
Change-Id: I7c34732c6bc8263c42461325437c90a06214d04a
 2014-02-25 11:08:35 -05:00
Mike Lockwood
4495c86dbf am f2d07694: am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit 'f2d07694d05240b039bd02cf3982941c0435c33d':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:54:25 +00:00
Mike Lockwood
f2d07694d0 am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '6eff99494dd7b274b3b9f89c64ece6cabaff5c8e':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:51:18 +00:00
Mike Lockwood
6eff99494d am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '0fc59cd958b87d015deac63797fcbfbcec518389':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:48:03 +00:00
Mike Lockwood
0fc59cd958 am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:44:24 +00:00
Mike Lockwood
da2bbaf219 am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:41:11 +00:00
Mike Lockwood
2c7b913e36 am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 2014-02-25 15:35:34 +00:00
Narayan Kamath
deaa6cc34d am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'cc99b18ce30e6847bd9b29129755f63efd4f06fe':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:20:52 +00:00
Narayan Kamath
58908b02f3 am d8410d38: am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'd8410d38cf2eb133dab29aec722dce862584d115':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:20:47 +00:00
Narayan Kamath
cc99b18ce3 am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:17:39 +00:00
Narayan Kamath
d8410d38cf am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit '614b00de9cdd354a289d98173ba656e5260288e7':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:17:37 +00:00
Narayan Kamath
a6f70d8b2d 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-02-25 13:14:35 +00:00
Narayan Kamath
614b00de9c am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:14:30 +00:00
Narayan Kamath
7fe5978bf7 am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit '2ba70fd49bfcbb516e75c198c106764609335feb':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 05:11:43 -08:00
Narayan Kamath
a88abfb3a5 am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit '6ab07fac49d6b618883a2ef4cea11f0959b3abe3':
  Use long for pointers in opengl/EGL classes
 2014-02-25 05:11:40 -08:00
Narayan Kamath
2ba70fd49b Merge "Use reinterpret_cast when an integer is cast to a pointer" 2014-02-25 13:05:48 +00:00
Narayan Kamath
6ab07fac49 Merge "Use long for pointers in opengl/EGL classes" 2014-02-25 13:05:44 +00:00
Kenny Guy
e21c52a8c9 Merge "Hide managed profiles from user switchers." 2014-02-25 13:01:38 +00:00
Derek Sollenberger
f5a9ad1cd0 Merge "Updates to the Skia API needed to merge the WebView m33 version of Skia." 2014-02-25 12:54:31 +00:00
Dan Sandler
ada31d3d38 Merge "Default Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS=1." 2014-02-25 12:34:13 +00:00
Nicolas Prevot
1f63810638 Merge "Adding the requiredForProfile flag." 2014-02-25 10:35:25 +00:00
Alan Viverette
6dd4e28b60 Merge "Force measurement in LinearLayout if any views are skipped" 2014-02-25 02:49:02 +00:00
Alan Viverette
65be9cc34c Force measurement in LinearLayout if any views are skipped 
BUG: 12249256
Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
 2014-02-24 18:21:09 -08:00
Dianne Hackborn
7a603b294d Merge "Fix some issues with network usage in battery stats." 2014-02-25 01:07:42 +00:00
Dianne Hackborn
fb7b50a026 Fix some issues with network usage in battery stats. 
Change-Id: I8b354872511fcb55cecb2e09aada2eab41a1e202
 2014-02-24 17:06:14 -08:00
Jeff Brown
eb1d804246 am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 
* commit '01d63a35245ad20cf5251b69777db5c81fc76a84':
  Fix typo that causes dreaming on battery.
 2014-02-25 00:40:54 +00:00
Jeff Brown
01d63a3524 am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 
* commit 'ae8106ef9cdea9b6325afec197023d5b2d6214d0':
  Fix typo that causes dreaming on battery.
 2014-02-25 00:37:42 +00:00
Justin Koh
ef57d02144 am ffbe7f83: (-s ours) am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 
* commit 'ffbe7f83ebc072d676e25c86d8ceb60205a9ec8a':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-25 00:32:54 +00:00
Jeff Brown
ae8106ef9c am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 
* commit '2326acb591d889d9492219f5f8f79940fd66ba70':
  Fix typo that causes dreaming on battery.
 2014-02-25 00:32:37 +00:00
Justin Koh
ffbe7f83eb am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 
* commit '2235288538d0c1758315bba961200d0e2254dedd':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-25 00:29:56 +00:00
Jeff Brown
2326acb591 Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 2014-02-25 00:27:41 +00:00
Justin Koh
2235288538 am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 
* commit 'bf3a45f3adc435d7670ac5a92d2fb73b1e21f7aa':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-25 00:24:51 +00:00
Justin Koh
bf3a45f3ad Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 2014-02-25 00:20:45 +00:00