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

45851 Commits

Author SHA1 Message Date
Narayan Kamath
133c9649c3 am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
  change Surface constructor arg to 64bit
 2014-01-31 12:17:05 +00:00
Nick Kralevich
643be3bab1 am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels." 
* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
  Map SELinux log levels to Android log levels.
 2014-01-31 10:26:32 +00:00
Hui Lu
3cab7fc1b8 Merge "Add proxy as another network." into klp-modular-dev 2014-01-30 22:58:48 +00:00
Hui Lu
1c5624a012 Add proxy as another network. 
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
 2014-01-30 17:26:18 -05:00
Chong Zhang
b215529c72 change Surface constructor arg to 64bit 
Bug: 12799017
Bug: 12799384

(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)

Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
 2014-01-30 09:50:21 +00:00
Stephen Smalley
e0dda3c8e2 Map SELinux log levels to Android log levels. 
Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-01-29 12:55:58 -05:00
Narayan Kamath
1a6e29aae5 am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit 'd933edc742dcaf96862b211f4641e4cfd98acef5':
  mNativeCanvas is long, not int.
 2014-01-29 15:38:42 +00:00
Narayan Kamath
d933edc742 am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
  mNativeCanvas is long, not int.
 2014-01-29 15:33:48 +00:00
Narayan Kamath
9ecada4404 am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
  mNativeCanvas is long, not int.
 2014-01-29 15:29:23 +00:00
Narayan Kamath
d228a03891 Merge "mNativeCanvas is long, not int." 2014-01-29 15:02:05 +00:00
Narayan Kamath
1caea796c9 am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit 'c74f7619e19f4d172fc0bc6220abc917024c45b0':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:23:45 +00:00
Narayan Kamath
67ac8120bf am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit '0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:23:40 +00:00
Narayan Kamath
e3a6663bb2 mNativeCanvas is long, not int. 
swapNativeCanvas was asking for an int field.

Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
 2014-01-29 12:21:32 +00:00
Narayan Kamath
c74f7619e1 am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:21:21 +00:00
Narayan Kamath
0cc4bb1ff3 am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:21:11 +00:00
Narayan Kamath
cdc095ae48 am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit '7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:18:31 +00:00
Narayan Kamath
e4fc5c17c0 am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:18:27 +00:00
Narayan Kamath
d4ccffd3ba Merge "AArch64: Use long for pointers in graphics/Interpolator" 2014-01-29 12:12:27 +00:00
Narayan Kamath
887b1ca879 Merge "AArch64: Use long for pointers in SurfaceTexture" 2014-01-29 12:12:17 +00:00
Narayan Kamath
4a58714606 am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit '09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:54:26 +00:00
Narayan Kamath
09d07d0d33 am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:51:51 +00:00
Narayan Kamath
e3e4b40577 am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit '9846fb695a3c41aabde4ca0061d583b35f9621d1':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:48:52 +00:00
Narayan Kamath
50afaefdc0 Merge "AArch64: Make Binder and Parcel 64-bit compatible" 2014-01-29 10:43:23 +00:00
Mark Salyzyn
c0b540dc87 am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '8bb5e66295f4f0f53dce13a877b922dead4639e8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:45:16 +00:00
Mark Salyzyn
8bb5e66295 am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit 'd732f561b24e643676812855396d0c9b9138b4c8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:42:07 +00:00
Mark Salyzyn
d732f561b2 am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:38:43 +00:00
Mark Salyzyn
967c5d00df Merge changes I3659193f,I8b78e4db 
* changes:
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:30:40 +00:00
Mike J. Chen
1ece04f37f Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev 2014-01-28 20:41:22 +00:00
Narayan Kamath
a35ca0ada3 am 8697dc67: am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit '8697dc674c7c5f33201d037e1c3ae59d9893a22d':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:26:36 +00:00
Narayan Kamath
583b7b1671 am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:26:29 +00:00
Narayan Kamath
8697dc674c am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit 'be674bf688fec9ce4ec04e77c93644be8253d273':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:22:12 +00:00
Narayan Kamath
39a789bf6e am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit '7ae1726d0b962878cce4c1fe6c814a315f253293':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:22:07 +00:00
Narayan Kamath
be674bf688 am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit '23abbfbb814501b825edc056027270f03f39506b':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:18:45 +00:00
Narayan Kamath
7ae1726d0b am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit 'aa9ba887371e875ffbde49f43fa12bb5f123425b':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:18:40 +00:00
Ashok Bhat
5753b45516 AArch64: Use long for pointers in graphics/Camera 
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Change-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-28 17:53:30 +00:00
Ashok Bhat
a0398430fc AArch64: Make graphics classes 64-bit compatible 
Changes in this patch include

[x] Long is used to store native pointers as they can
    be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
    yet. Specifically mAtlasMap member has to be converted
    to hold native pointer using long. Added a TODO to
    AssetAtlasManager.java to indicate the change required.

Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-28 17:40:38 +00:00
Mike J. Chen
d96d5cfffc BluetoothInputJava: Add broadcast action REPORT 
It's returned by getReport() when callback data is ready.

Change-Id: I751c9e31de3d82a454a62cb8485a230e722b740d
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-01-27 17:55:40 -08:00
Mike J. Chen
bfa3f4fd5c Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modular-dev 2014-01-28 01:28:36 +00:00
Mike J. Chen
1b47f7cc1a BluetoothInputDevice: make REPORT_TYPE values match hal 
So we don't have to do conversion when using getReport/setReport
and can pass the value to the BT HAL directly.

Change-Id: I8d4af72d2e040d43cc9ff8a8cddfbe6cc8cfdb9a
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-01-27 16:27:04 -08:00
Jeff Brown
df8b604e9b Merge "Fix NPE in deleteDatabase()." into klp-modular-dev 2014-01-28 00:09:42 +00:00
Jeff Brown
065d998a4c Merge "Hide an old debug function." into klp-modular-dev 2014-01-28 00:09:07 +00:00
Mark Salyzyn
3ed8e2e679 jni: Resolve build warnings 
(cherry picked from commit 087f58dd80e3296a53c6e3c74c089e9a0265f3bd)

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
 2014-01-27 15:25:51 -08:00
Mark Salyzyn
7933c2943f jni: Incorporate liblog reading API 
(cherry picked from commit e11cbd441df4a1689c89b2ab91b84523c9f2fd10)

Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
 2014-01-27 15:25:09 -08:00
Christopher Tate
86824cf0a9 am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '3a3def1304b0fa9ed72003882716ad43e85b13d3':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 19:54:30 +00:00
Mathieu Chartier
698d367317 am 4a750c1f: am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '4a750c1f4a2760ae564fa56717c04a5f01396090':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 19:49:35 +00:00
Christopher Tate
3a3def1304 am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '0e8f02d68f8cfe14e14800520a8133bc7efd13b7':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 19:48:03 +00:00
Christopher Tate
0e8f02d68f am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '76dcacada75f192d74ea83cf6b5ce1747c9437ad':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 11:43:23 -08:00
Mathieu Chartier
4a750c1f4a am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '15594557f118f670e8d8523e9aed0df3345d28ca':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 19:30:35 +00:00
Christopher Tate
1ff4293e33 Merge "Fixed race condition in Spinner.DialogPopup on null reference." 2014-01-27 19:29:56 +00:00
Mathieu Chartier
15594557f1 am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '137d74d89cc57d146af8ca91ad7830a950c7e8b8':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 11:20:21 -08:00