45981 Commits

Author SHA1 Message Date
Narayan Kamath
d0ec6d8c50 am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit 'bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
  Fix preference puts with "null" values.
2014-01-13 05:01:44 -08:00
Narayan Kamath
cb4d3ec1ea Merge "Fix preference puts with "null" values." 2014-01-13 12:29:41 +00:00
Craig Mautner
4504de5d5a Implement ActivityView.
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
2014-01-10 10:54:55 -08:00
Adam Powell
9c9975ac3d Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev 2014-01-10 18:30:23 +00:00
Craig Mautner
96ada57b2c Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev 2014-01-10 18:21:50 +00:00
Craig Mautner
bd503a4e3a Allow for the possibility of null ActivityContainer
When BinderProxy is passed in as the IBinder for
getEnclosingActivityContainer the activity manager cannot turn it into
an ActivityRecord. This causes NPE in ActivityThread which is Not Good
(tm).

Allowing null to be returned when requesting an ActivityContainer and
handling it appropriately fixes this bug.

Fixes bug 12473669.

Change-Id: I6937636042f8853b3ddc2df40be010e7391e41a5
2014-01-10 10:16:43 -08:00
Adam Powell
efc3bb0612 Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
2014-01-10 10:16:27 -08:00
Ashok Bhat
63a3715323 AArch64: Use long for pointers in android/os/MessageQueue
Long is used in android/os/MessageQueue class to store
pointers 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: I7e901b8515a5b5e3afe1dadaaf3e5c186955c2a0
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-10 15:36:16 +00:00
Ashok Bhat
c20cadbdad AArch64: Use long for pointers in android/os/MemoryFile
Long is used in android/os/MemoryFile class to store
pointers 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: I07afc010524c16b5c852273b89becb0c08ff27d7
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-10 15:14:46 +00:00
Christopher Tate
7b3cfebce3 am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit 'f1fbe1135a2872a7287f5c06af211cf780f16598':
  Cursor leakage due to cancellation signal
2014-01-09 20:53:45 +00:00
Christopher Tate
f1fbe1135a am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '4ba1bbadb784e365f443b0272b111d384f4f2229':
  Cursor leakage due to cancellation signal
2014-01-09 20:50:22 +00:00
Christopher Tate
4ba1bbadb7 am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
  Cursor leakage due to cancellation signal
2014-01-09 12:47:50 -08:00
Christopher Tate
35b7de4c45 Merge "Cursor leakage due to cancellation signal" 2014-01-09 20:41:26 +00:00
Vinod Krishnan
aef49f9a71 Fwk: Adding a micro theme
Adding a micro theme affects 3 different GIT repositories:

1. Repository 'device/google/clockwork' - https://ar/398971
This has the overlay for the DeviceDefault for ClockWork

2. Repository 'platform/vendor/google_clockwork' - https://ar/399378
This has the changes to Clockwork Home to use the new micro Theme.

3. Repository 'frameworks/base' - https://ar/398959
This adds the *_micro.xml style/theme files.

Change-Id: Ib1e87953b052a9ec2ff0ea11dd0dfe55317442b4
2014-01-09 11:11:56 -08:00
Ashok Bhat
a931d5218c AArch64: Use long for pointers in view/input classes
For storing pointers, long is used in view/input classes,
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: Iafda9f4653c023bcba95b873637d935d0b569f5d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-09 15:12:04 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Wink Saville
f05ae3fe0f am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:37:30 +00:00
Wink Saville
bc0207fdbd am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '2626d0e18dc9898d70f75540fabc67421f33fab3':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:34:12 +00:00
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:31:02 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Ashok Bhat
96804bc8fb AArch64: Use long for pointers in VelocityTracker class
For storing pointers, long is used in VelocityTracker class,
as native pointers can be 64-bit.

Change-Id: I8c454663a97745c7440bb6f99ef49d28e9026876
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-08 18:48:19 +00:00
Ashok Bhat
99a1ef2b7f AArch64: Use long for pointers in MotionEvent class
For storing pointers, long is used in MotionEvent class,
as native pointers can be 64-bit.

Change-Id: I88ebfef26070b7f49c14945cad37aa3db209ec90
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-08 18:31:59 +00:00
Ashok Bhat
0c3f921016 AArch64: Use long for pointers in KeyCharacterMap class
For storing pointers, long is used in KeyCharacterMap class,
as native pointers can be 64-bit.

Change-Id: Idc1b39874202e96b9231d7801e6707003787659b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 18:19:21 +00:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
2014-01-08 08:01:42 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Rakesh Pallerla
b8b7bd3185 Telephony: Modify code to check that PUK code length is always 8.
As per 3GPP TS 31.101 Release 11 section 9.6, the number of digits
for UNBLOCK PIN (PUK) is always 8.

Change-Id: I4ea69fd8e2e8e96330d10a67b2d1f5a1859c1016
2014-01-08 19:46:25 +05:30
Narayan Kamath
db47efd3f8 am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '651807fcd0b1012ea848efe5f67b4381d8ce6797':
  AArch64: Use long for pointers in App/Backup
2014-01-08 12:33:16 +00:00
Narayan Kamath
55a12adc19 am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
* commit '72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
  AArch64: Use long for pointers
2014-01-08 12:33:11 +00:00
Narayan Kamath
29eadb328a am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '9a743575254d7d5d456456517171f0ee31bc9247':
  AArch64: Use long for pointers in hardware classes
2014-01-08 12:33:06 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
2014-01-08 12:05:13 +00:00
Narayan Kamath
c6f429007c Fix preference puts with "null" values.
Null values were being written out as <null /> elements in the
XML prefs file (as expected). This allowed the getFoo() functions
to work correctly because they treated null values as missing mappings
but containsKey would fail.

bug: https://code.google.com/p/android/issues/detail?id=64563
Change-Id: I1f466d01db96bf26e208d4fed3a6f257228bea5d
2014-01-08 12:04:53 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
2014-01-08 04:02:05 -08:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
2014-01-08 12:01:09 +00:00
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
2014-01-08 03:58:17 -08:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup
For storing pointers, long is used, 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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 11:54:01 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 11:53:21 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware classes,
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: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 10:17:21 +00:00
Jeff Brown
d14c8c9039 Add flag to force public virtual display to show own content.
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
2014-01-07 19:30:07 -08:00
Robert Greenwalt
080d1bdd7f am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-08 00:50:16 +00:00
Robert Greenwalt
132a55375e am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '400e6b705f860fe70264a8b2d73c82772d734ad7':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-08 00:47:37 +00:00
Robert Greenwalt
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-07 16:44:30 -08:00
Robert Greenwalt
517e9b11d5 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 2014-01-08 00:38:29 +00:00
Ian Rogers
878df18c48 am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
  Add a call to registerAppInfo for the VMRuntime
2014-01-07 21:45:07 +00:00
Ian Rogers
8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime
2014-01-07 21:41:34 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
2014-01-07 13:38:44 -08:00