Commit Graph

33773 Commits

Author SHA1 Message Date
Narayan Kamath
c2cf1e1df4 Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-29 15:26:48 +00:00
Evan Charlton
33da8dde5f Merge "Allow for a configurable WiFi restore bounce delay" 2014-01-29 14:58:29 +00:00
Narayan Kamath
ef099b7183 am 4a587146: am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '4a58714606fdeb2e740b0ce51ea5074783e2ecf4':
  AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 12:50:02 +00:00
Ashok Bhat
fbb35fb39e AArch64: Use of long for pointers in PropertyValuesHolder
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry picked from commit 0141e88434)

Change-Id: I80408a7227427732db0d8b4c960bcb849b7c8060
2014-01-29 11:07:06 +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
Fabrice Di Meglio
ab5e089585 Merge "Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification." 2014-01-28 23:16:08 +00:00
Fabrice Di Meglio
ef4aad220f Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API" 2014-01-28 23:15:24 +00:00
Fabrice Di Meglio
fa55105137 Merge "Fix new TimePicker accessibility" 2014-01-28 23:14:49 +00:00
Svetoslav Ganov
c0877962b3 Adding the print and accessibility pacelables to framework.aidl
1. There are a few parcelable classes related to printing and accessibility
   which are public but not added in the framework.aidl list so third parties
   cannot write aidl interfaces that pass these classes. As these classes
   are public it is resonable for devepers to be able to pass them between
   processes.

Change-Id: I85da1de5198902b74f19d23e3fe16b45b4a11051
2014-01-28 23:00:14 +00:00
Fabrice Di Meglio
ba4d2a08f9 Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification.
- add missing notifyDataSetChanged() call

Change-Id: I633b78be3805bc8610b4aaeb70b1988768f764b7
2014-01-28 14:55:17 -08:00
Mike J. Chen
5dadeba229 am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev
* commit '1ece04f37fc93983ee058916e9913b6341e6de83':
  BluetoothInputJava: Add broadcast action REPORT
2014-01-28 20:44:25 +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
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
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
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
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
Ashok Bhat
36bef0bf30 AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
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.

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>

==================================================================

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)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
2014-01-28 10:02:43 +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
729b12c7a9 am bfa3f4fd: Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modular-dev
* commit 'bfa3f4fd5c30b0d53addc071ecf8e099529f2c77':
  BluetoothInputDevice: make REPORT_TYPE values match hal
2014-01-28 01:32:53 +00: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
Selim Gurun
b40bbe7d8e Merge "Remove defunct flag" 2014-01-28 01:06:44 +00:00
Dianne Hackborn
4a4cfbe7d8 Merge "Add "start time" timestamp to battery stats." 2014-01-28 01:00:22 +00:00
John Reck
e742799cae Merge "Native-side proxy" 2014-01-28 00:45:44 +00:00
John Reck
4f02bf4eef Native-side proxy
Remove RemoteGLRenderer
 Remove reflection-based control

Change-Id: If17c2bbb61c7141986d88c4763def77ed1074985
2014-01-27 16:40:39 -08: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
548061e5b6 am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev
* commit 'df8b604e9bf49bcf9a620e4fe19ccf19c2c49487':
  Fix NPE in deleteDatabase().
2014-01-28 00:13:27 +00:00
Jeff Brown
d16c409e55 am 065d998a: Merge "Hide an old debug function." into klp-modular-dev
* commit '065d998a4c3d597e924f42635d1a3699a6fcf34b':
  Hide an old debug function.
2014-01-28 00:13:12 +00: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
Selim Gurun
4306ae1798 Remove defunct flag
Change-Id: Ib745f225f40a9cd7bf62a93f9546bd31f1507cbf
2014-01-27 13:39:24 -08:00
Zhihai Xu
8a5703c8c8 Merge "bluetoothsocket fd leak, need close the file descriptor after detachFd." 2014-01-27 20:42:18 +00:00
Christopher Tate
ca5766cf26 am 86824cf0: am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '86824cf0a994abc38f08ac5692cf6b73cd10526e':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 20:00:21 +00: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
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
Christopher Tate
1ff4293e33 Merge "Fixed race condition in Spinner.DialogPopup on null reference." 2014-01-27 19:29:56 +00:00
Narayan Kamath
7023df08f1 Revert "AArch64: Make graphics classes 64-bit compatible"
This reverts commit 18b4cbeede.

Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
2014-01-27 14:22:45 +00:00
Ashok Bhat
18b4cbeede AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
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.

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>

==================================================================

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)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
2014-01-27 13:28:16 +00:00
Dianne Hackborn
5f4a5f9536 Add "start time" timestamp to battery stats.
Change-Id: I902269b98b40b2421245bfd8971f34df5ff9214e
2014-01-24 17:27:02 -08:00
Dianne Hackborn
31d9989e75 Merge "Add app version codes to procstats." 2014-01-24 23:30:51 +00:00
Jeff Brown
fce5890a11 Fix NPE in deleteDatabase().
If the directory containing the database does not exist then
listFiles() will return null.  Tolerate this situation instead
of crashing.

Bug: 12600784
Change-Id: I5d83a867a5e8478f50887e5798b42c5f6859b77c
2014-01-24 13:20:57 -08:00
Jeff Brown
8aca9e335f Hide an old debug function.
Change-Id: If12b967955847d257dac0431dabe0dca41865b58
2014-01-24 13:10:19 -08:00
Narayan Kamath
8435cf0d8b Merge "Hide android.os.Parcel.obtain(int)." 2014-01-24 14:59:06 +00:00
Narayan Kamath
01664b3709 am 5d094b94: am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '5d094b947b328d2631a0203c1527b0c7c20ce219':
  Remove unused field from AssetManager.
2014-01-24 09:52:55 +00:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
2014-01-24 01:42:08 -08:00