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

124362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
ef1bcec0f5 Fix boot crash on devices defaulting to landscape. 
This is probably not what keyguard_simple_host_view should
look like in landscape, but we need the resource.

Bug: 13185323
Change-Id: Ib044db1f86510128d27ecf45546398c7c1b81aa4
 2014-02-25 12:11:05 -05: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
Narayan Kamath
2d19d202bd Make getAssetInt throw unconditionally. 
All callers have been moved over to getNativeAsset, and
this method has been hidden from the public API internally.

Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
 2014-02-25 15:48:07 +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
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base. 
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
 2014-02-25 09:49:29 -05: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
Jeff Brown
966604f159 Fix typo that causes dreaming on battery. 
Bug: 13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
 2014-02-24 16:19:51 -08:00
Takahiro Aizawa
5b4a857603 DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp 
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
 2014-02-25 00:00:16 +00:00
Robert Greenwalt
950230663f DO NOT MERGE Sanitize WifiConfigs 
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
 2014-02-24 15:20:32 -08:00
Zhijun He
cc28a41b48 Camera2: Correct some minor errors in awb region spec 
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
 2014-02-24 15:11:23 -08:00
Jeff Brown
3651cb7b4a am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'cd9cd758d6dc884220f86ff10812c9e33a978de5':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:25:19 +00:00
John Spurlock
952862085a Merge "Remove tabs from NotificationData." 2014-02-24 22:24:15 +00:00
Deepanshu Gupta
5ac6a9e9b7 Update layoutlib method for SystemClock 
Update layoutlib to reflect changes from
http://android-review.googlesource.com/83061/

Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
 2014-02-24 14:22:29 -08:00
Jeff Brown
cd9cd758d6 am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'c213b3a34ccee7cfa72dab281cfa950e5f7df6fc':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:21:50 +00:00
Jeff Brown
c213b3a34c am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'f7f80d7b54b11d432bb6e72da526edf369128ea7':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:18:32 +00:00
Jeff Brown
f7f80d7b54 Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 2014-02-24 22:16:00 +00:00
Jeff Brown
e0dd3ca81d Start the dream manager even if dreams are not supported. 
The dreams manager also manages dozing.  It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).

Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.

Bug: 12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
 2014-02-24 14:07:27 -08:00