Commit Graph

32829 Commits

Author SHA1 Message Date
Craig Mautner
323601475e am df88d730: Add IIntentSender to ActivityContainer.startActivity
* commit 'df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
  Add IIntentSender to ActivityContainer.startActivity
2014-02-04 23:38:28 +00:00
Craig Mautner
df88d73092 Add IIntentSender to ActivityContainer.startActivity
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.

Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.

Fixes bug 12747909.

Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
2014-02-04 15:10:13 -08:00
John Spurlock
be878d8773 am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java
* commit 'b6a4926c670244fbf7d7033f2a1b46da25b35d39':
  Fix typo in ImageView.java
2014-02-03 17:27:11 +00:00
John Spurlock
b6a4926c67 am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java
* commit '647db9fae37b36d99ce290acfae7b453f00ae5af':
  Fix typo in ImageView.java
2014-02-03 17:24:05 +00:00
John Spurlock
647db9fae3 am 76ecd66a: am 0196e561: Fix typo in ImageView.java
* commit '76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
  Fix typo in ImageView.java
2014-02-03 17:21:25 +00:00
John Spurlock
76ecd66a6d am 0196e561: Fix typo in ImageView.java
* commit '0196e561f280e6cc361442036da277a630e68558':
  Fix typo in ImageView.java
2014-02-03 17:18:37 +00:00
John Spurlock
0196e561f2 Fix typo in ImageView.java
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
2014-02-03 09:00:35 -05:00
Craig Mautner
d5f1fcb7a4 am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '56bf2f670c800f569fc72102e79fd555b6102677':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
2014-01-31 19:26:17 +00:00
Craig Mautner
56bf2f670c Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 2014-01-31 19:23:36 +00:00
Craig Mautner
e1f3fa2482 Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Fixes bug 12592453.

Change-Id: Ib64559727d59b3433c3753f9fda88329effc7e26
2014-01-31 11:20:40 -08:00
Narayan Kamath
797b5adcb4 am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
2014-01-31 16:29:23 +00:00
Narayan Kamath
ff62e966b6 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
2014-01-31 16:29:16 +00:00
Ashok Bhat
896043d67d AArch64: Make AssetManager and related classes 64-bit compatible
Following changes have been done:

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

[x] AssetManager openAsset native function returned -1 if
    file name was empty and java function considered any
    non-zero value as success. This has been fixed by native
    function throwing Illegal Argument Exception as well.

[x] AssetManager incRefsLocked and decRefsLocked now accept
    long as input to support 64-bit native references.

[x] AssetManager incRefsLocked method incorrecly used
    'this.hashCode()' instead of the passed parameter id.
    This has been fixed.

[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)

Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
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>
2014-01-31 14:14:29 +00:00
Narayan Kamath
b9f960e094 Merge "Fixed cancel() not working correctly" 2014-01-31 13:20:58 +00:00
Narayan Kamath
5cdbac1e44 am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
2014-01-31 12:17:09 +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
jl1990
3cd12a5155 Fixed cancel() not working correctly
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)

bug: https://code.google.com/p/android/issues/detail?id=58668

Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
2014-01-30 13:46:44 +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
Ashok Bhat
0141e88434 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.

Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-29 10:47:27 +00:00
Narayan Kamath
50afaefdc0 Merge "AArch64: Make Binder and Parcel 64-bit compatible" 2014-01-29 10:43:23 +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
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
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
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
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
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 14:39:53 -08:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit c6a2a6e20f.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 19:54:15 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 11:51:22 -08:00
Selim Gurun
c6a2a6e20f Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
Bug: b/10629847

(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
2014-01-23 11:21:00 -08:00