OSDN Git Service
Jinsuk Kim [Mon, 31 Mar 2014 01:44:51 +0000 (01:44 +0000)]
am
41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
* commit '
41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
Replace individual methods with a consolidated CEC nativeSendmessage
Jinsuk Kim [Mon, 31 Mar 2014 01:40:30 +0000 (01:40 +0000)]
Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
Wink Saville [Sun, 30 Mar 2014 15:17:38 +0000 (15:17 +0000)]
am
44b43a51: am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 15:11:27 +0000 (15:11 +0000)]
am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 00:15:22 +0000 (00:15 +0000)]
Merge "GlobalActions: Fix Airplane Mode on/off issue"
Wei Wang [Sat, 29 Mar 2014 01:57:31 +0000 (01:57 +0000)]
am
4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '
4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
Wei Wang [Sat, 29 Mar 2014 01:53:33 +0000 (01:53 +0000)]
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
Wei Wang [Sat, 29 Mar 2014 01:40:29 +0000 (18:40 -0700)]
Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
Michael Wright [Sat, 29 Mar 2014 00:59:49 +0000 (00:59 +0000)]
am
e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit '
e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
Michael Wright [Sat, 29 Mar 2014 00:59:46 +0000 (00:59 +0000)]
am
d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* commit '
d020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
Michael Wright [Sat, 29 Mar 2014 00:56:17 +0000 (00:56 +0000)]
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:56:00 +0000 (00:56 +0000)]
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
nagarw [Thu, 20 Feb 2014 11:40:46 +0000 (17:10 +0530)]
GlobalActions: Fix Airplane Mode on/off issue
Issue: Unable to turn off Airplane mode from power button
after phone reboot
Fix: Initialize mHasTelephony before the PhoneStateListener is
registered to the TelephonyManager so that correct value
of mHasTelephony is reflected when onServiceStateChanged
callback is called.
Bug:
13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
Jeff Hao [Fri, 28 Mar 2014 23:05:46 +0000 (23:05 +0000)]
am
d648e5f7: am
e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit '
d648e5f7ba26fc835c0448740f33c49874d51a3b':
Mark constructor as accessible in LayoutInflater.
Craig Mautner [Fri, 28 Mar 2014 23:05:42 +0000 (23:05 +0000)]
am
155e3133: am
d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '
155e3133407e590f18e7e16eddc6fc743f35b0fd':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Michael Wright [Fri, 28 Mar 2014 23:05:36 +0000 (23:05 +0000)]
am
6a14146b: am
e328056d: Merge "Add support for additional international keyboard mappings"
* commit '
6a14146b379b33a6bf947f02b2550fa97c5619b6':
Add support for additional international keyboard mappings
Craig Mautner [Fri, 28 Mar 2014 23:05:33 +0000 (23:05 +0000)]
am
9395dab7: (-s ours) am
ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '
9395dab7c38d540bea926307c448d5cc5032ac7d':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Adam Hampson [Fri, 28 Mar 2014 23:04:01 +0000 (23:04 +0000)]
am
594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
* commit '
594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
hdmi: cec: add permission name to dump permission denial message
Aaron Whyte [Fri, 28 Mar 2014 23:03:56 +0000 (23:03 +0000)]
am
f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
* commit '
f10d0399bf5f519dff414a9d195a0eaacb37f9b7':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
Adam Hampson [Fri, 28 Mar 2014 22:22:51 +0000 (22:22 +0000)]
Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
Aaron Whyte [Fri, 28 Mar 2014 21:42:39 +0000 (14:42 -0700)]
Made secure-adb's new-public-key activity configurable.
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.
Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
Jeff Hao [Fri, 28 Mar 2014 22:16:41 +0000 (22:16 +0000)]
am
e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit '
e9b4fd0718c00a504602453185de676618beed4b':
Mark constructor as accessible in LayoutInflater.
Craig Mautner [Fri, 28 Mar 2014 22:16:38 +0000 (22:16 +0000)]
am
d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '
d511bc17d614b1291f1b85f84180c1db157d2790':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Michael Wright [Fri, 28 Mar 2014 22:16:35 +0000 (22:16 +0000)]
am
e328056d: Merge "Add support for additional international keyboard mappings"
* commit '
e328056ddcba0edd0e49b4697dfcc84f3658cb39':
Add support for additional international keyboard mappings
Craig Mautner [Fri, 28 Mar 2014 22:16:33 +0000 (22:16 +0000)]
am
ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '
ff3362f0d8378d616f39cbcf8b86b6f03e7d30b9':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Jeff Hao [Fri, 28 Mar 2014 21:41:20 +0000 (21:41 +0000)]
Merge "Mark constructor as accessible in LayoutInflater."
Craig Mautner [Fri, 28 Mar 2014 20:27:32 +0000 (20:27 +0000)]
Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
Michael Wright [Fri, 28 Mar 2014 20:26:08 +0000 (20:26 +0000)]
Merge "Add support for additional international keyboard mappings"
Craig Mautner [Fri, 28 Mar 2014 20:23:34 +0000 (20:23 +0000)]
Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
Michael Wright [Fri, 28 Mar 2014 19:59:34 +0000 (12:59 -0700)]
Add InputDevice#supportsSource(int).
This mirrors the InputEvent#isFromSource API.
Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
John Spurlock [Fri, 28 Mar 2014 19:01:10 +0000 (19:01 +0000)]
am
5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.
* commit '
5579ec33eb317a19ad80929169b2b329b147d98b':
DO NOT MERGE Enhance the NotificationListenerService api.
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater.
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
Anders Kristensen [Fri, 28 Mar 2014 17:31:33 +0000 (17:31 +0000)]
am
aee03bb1: am
49c06150: Merge "Remove duplicate call disconnect codes."
* commit '
aee03bb1a1077427c918ad9fea5fdd1ab204f60e':
Remove duplicate call disconnect codes.
Anders Kristensen [Fri, 28 Mar 2014 17:27:18 +0000 (17:27 +0000)]
am
49c06150: Merge "Remove duplicate call disconnect codes."
* commit '
49c061501dbcff0dd6f6621afa76136d0857622a':
Remove duplicate call disconnect codes.
Anders Kristensen [Fri, 28 Mar 2014 17:19:57 +0000 (17:19 +0000)]
Merge "Remove duplicate call disconnect codes."
John Spurlock [Fri, 28 Mar 2014 13:42:05 +0000 (09:42 -0400)]
DO NOT MERGE Enhance the NotificationListenerService api.
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:
13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
Wei Wang [Fri, 28 Mar 2014 04:07:55 +0000 (04:07 +0000)]
am
9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev
* commit '
9d3e099699c3b6cd0f4bed344607d6a5acd75c1c':
Add comment of using same callback for start/stop advertising.
Wei Wang [Fri, 28 Mar 2014 04:04:47 +0000 (04:04 +0000)]
Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev
Scott Main [Fri, 28 Mar 2014 03:29:05 +0000 (03:29 +0000)]
Scott Main [Fri, 28 Mar 2014 03:23:18 +0000 (03:23 +0000)]
am
a3a4d466: am
83d6ae28: fix broken links
* commit '
a3a4d46609ebb1470d24c7d77662a8b16440765c':
fix broken links
Scott Main [Fri, 28 Mar 2014 03:15:10 +0000 (03:15 +0000)]
am
83d6ae28: fix broken links
* commit '
83d6ae2804e280bd1e0980faf4e3090d240eb5f5':
fix broken links
Scott Main [Fri, 28 Mar 2014 03:07:48 +0000 (20:07 -0700)]
fix broken links
Change-Id: I5964804c219ef02cd5f380bf752061ff7a022d61
Wei Wang [Fri, 28 Mar 2014 02:34:46 +0000 (19:34 -0700)]
Add comment of using same callback for start/stop advertising.
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
Jeff Sharkey [Fri, 28 Mar 2014 01:56:08 +0000 (01:56 +0000)]
am
2d8f330f: am
a686d16d: am
0bc7cea6: Enlarge space allowed for internal downloads.
* commit '
2d8f330fe709d405915ebb1fa2673e575e19112e':
Enlarge space allowed for internal downloads.
Brian Carlstrom [Fri, 28 Mar 2014 01:50:53 +0000 (01:50 +0000)]
am
bd877cb6: am
69511ada: am
b244097b: am
cc4d10d0: (-s ours) am
cec0280a: am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
bd877cb67f09277679007bc705e28ee4a2eda02f':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Jeff Sharkey [Fri, 28 Mar 2014 01:49:21 +0000 (01:49 +0000)]
am
a686d16d: am
0bc7cea6: Enlarge space allowed for internal downloads.
* commit '
a686d16d5924d2afe06586110e7dca33ecad535c':
Enlarge space allowed for internal downloads.
Brian Carlstrom [Fri, 28 Mar 2014 01:45:14 +0000 (01:45 +0000)]
am
69511ada: am
b244097b: am
cc4d10d0: (-s ours) am
cec0280a: am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
69511ada3cc833f341bd7df006de0f8c44848eb8':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Jeff Sharkey [Fri, 28 Mar 2014 01:43:53 +0000 (01:43 +0000)]
am
0bc7cea6: Enlarge space allowed for internal downloads.
* commit '
0bc7cea6aa2523f9f519f63038c541cb1b1942a8':
Enlarge space allowed for internal downloads.
Jeff Sharkey [Fri, 28 Mar 2014 01:16:32 +0000 (18:16 -0700)]
Enlarge space allowed for internal downloads.
Bug:
13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
Brian Carlstrom [Fri, 28 Mar 2014 01:13:04 +0000 (01:13 +0000)]
am
b244097b: am
cc4d10d0: (-s ours) am
cec0280a: am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
b244097b48398514c88c21506567fe400fb41f9e':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Brian Carlstrom [Fri, 28 Mar 2014 01:08:43 +0000 (01:08 +0000)]
am
cc4d10d0: (-s ours) am
cec0280a: am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
cc4d10d0f1f349ad13dcd67fc19718bf31932840':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Brian Carlstrom [Fri, 28 Mar 2014 01:01:40 +0000 (01:01 +0000)]
am
cec0280a: am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
cec0280a1d935cf31f6b2b480af0f463e2d8c91a':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Baligh Uddin [Thu, 27 Mar 2014 23:10:35 +0000 (23:10 +0000)]
am
0b7f300a: (-s ours) am
852750b3: (-s ours) am
537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
0b7f300a5545dc3576e74f4702bcc6b5497348f1':
Import translations. DO NOT MERGE
Selim Cinek [Thu, 27 Mar 2014 23:10:32 +0000 (23:10 +0000)]
am
58e99f56: am
b6e077dc: am
7718fc12: Fixed crash when setting wallpaper with built in rotation
* commit '
58e99f564d552984d5088969a2aa827812db10ac':
Fixed crash when setting wallpaper with built in rotation
Baligh Uddin [Thu, 27 Mar 2014 23:05:01 +0000 (23:05 +0000)]
am
852750b3: (-s ours) am
537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
852750b321c8f23c0b776a193a65d8f78afcf22b':
Import translations. DO NOT MERGE
Selim Cinek [Thu, 27 Mar 2014 23:04:57 +0000 (23:04 +0000)]
am
b6e077dc: am
7718fc12: Fixed crash when setting wallpaper with built in rotation
* commit '
b6e077dcbe1034007fd52b48951637a9be4bab74':
Fixed crash when setting wallpaper with built in rotation
Brian Carlstrom [Thu, 27 Mar 2014 22:29:08 +0000 (22:29 +0000)]
am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
bea6517da91e9af08feb8c305ec9d9a4576dc6ad':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Baligh Uddin [Thu, 27 Mar 2014 22:15:45 +0000 (22:15 +0000)]
am
537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
537ea90e554946ccb05af321e19df3a3fb377d2a':
Import translations. DO NOT MERGE
Selim Cinek [Thu, 27 Mar 2014 22:15:37 +0000 (22:15 +0000)]
am
7718fc12: Fixed crash when setting wallpaper with built in rotation
* commit '
7718fc1291c73576417f0c25d88f5105f7ae7365':
Fixed crash when setting wallpaper with built in rotation
Brian Carlstrom [Thu, 27 Mar 2014 22:15:24 +0000 (22:15 +0000)]
am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
e0b94d1cf16c11406554edd035c7e1bef6d2b844':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Baligh Uddin [Thu, 27 Mar 2014 22:14:24 +0000 (22:14 +0000)]
am
de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
de11c26060d0ed58ea40cefa2e45b7a14fb65d36':
Import translations. DO NOT MERGE
Brian Carlstrom [Thu, 27 Mar 2014 21:50:06 +0000 (14:50 -0700)]
Revert "Remove doSingleCrunch call DO NOT MERGE"
This reverts commit
3944abbb506bb94d8e70b8b62f30225777f50648.
Baligh Uddin [Thu, 27 Mar 2014 21:43:40 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 27 Mar 2014 21:43:39 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Adam Hampson [Thu, 27 Mar 2014 16:58:45 +0000 (09:58 -0700)]
hdmi: cec: add permission name to dump permission denial message
The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.
Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
Adam Lesinski [Thu, 27 Mar 2014 21:05:06 +0000 (21:05 +0000)]
am
004ceaaa: am
55a65509: Merge "Reduce warning verbosity in aapt"
* commit '
004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
Reduce warning verbosity in aapt
Adam Lesinski [Thu, 27 Mar 2014 21:00:08 +0000 (21:00 +0000)]
am
55a65509: Merge "Reduce warning verbosity in aapt"
* commit '
55a655091a30667ba7c091dc22d350c0bb8d8641':
Reduce warning verbosity in aapt
Adam Lesinski [Thu, 27 Mar 2014 20:55:14 +0000 (20:55 +0000)]
Merge "Reduce warning verbosity in aapt"
Craig Mautner [Thu, 27 Mar 2014 20:25:45 +0000 (20:25 +0000)]
am
bffd4d43: Merge "Check return values for null." into klp-modular-dev
* commit '
bffd4d437d133164877c6a194d6a533299072fae':
Check return values for null.
Craig Mautner [Thu, 27 Mar 2014 20:22:20 +0000 (20:22 +0000)]
Merge "Check return values for null." into klp-modular-dev
Craig Mautner [Thu, 27 Mar 2014 20:19:29 +0000 (13:19 -0700)]
Check return values for null.
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.
Fixes bug
13616765.
Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
Scott Main [Thu, 27 Mar 2014 20:19:20 +0000 (20:19 +0000)]
am
7b190e0f: am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
7b190e0f1df16346696465c0114179b423afc26d':
update viewport variable with new underscore format
Craig Mautner [Thu, 27 Mar 2014 20:14:13 +0000 (20:14 +0000)]
am
7f7ce0f7: am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
7f7ce0f71b5f1b5274b0cda190401823508cda1f':
Do not show Home behind full screen activity
Scott Main [Thu, 27 Mar 2014 20:13:59 +0000 (20:13 +0000)]
am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
22b483ee6e029dc9db4ae390b91c449b7977273d':
update viewport variable with new underscore format
Scott Main [Thu, 27 Mar 2014 20:08:17 +0000 (20:08 +0000)]
am
bbaf11f4: update viewport variable with new underscore format
* commit '
bbaf11f42152d03c26ec0dc02061dc93a1feb830':
update viewport variable with new underscore format
Craig Mautner [Thu, 27 Mar 2014 20:07:57 +0000 (20:07 +0000)]
am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
a282441038b8a82be1b9b6afc41145e5570ce377':
Do not show Home behind full screen activity
Scott Main [Thu, 27 Mar 2014 20:01:56 +0000 (13:01 -0700)]
update viewport variable with new underscore format
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
Craig Mautner [Thu, 27 Mar 2014 20:01:11 +0000 (20:01 +0000)]
Merge "Do not show Home behind full screen activity"
Selim Cinek [Thu, 27 Mar 2014 19:27:48 +0000 (20:27 +0100)]
Fixed crash when setting wallpaper with built in rotation
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees
Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug:
13507421
Scott Main [Thu, 27 Mar 2014 19:17:05 +0000 (19:17 +0000)]
am
4243710b: am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
4243710bf8b4bf3a0bec9c4cf3b00e4b69651883':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:08:23 +0000 (19:08 +0000)]
am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:02:33 +0000 (19:02 +0000)]
am
0c933df6: fix bug in code snippet
* commit '
0c933df6d09dfb3923e0891028c67249bc8887d5':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 18:53:38 +0000 (11:53 -0700)]
fix bug in code snippet
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
Colin Cross [Thu, 27 Mar 2014 17:36:27 +0000 (17:36 +0000)]
am
232d4224: am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
232d422405d686eb493b48370a2b2f7c35fe96fb':
app_process: use LOCAL_MULTILIB := both
Colin Cross [Thu, 27 Mar 2014 17:30:01 +0000 (17:30 +0000)]
am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
f0ffa8a38e90f64912686833dba9823b251fae57':
app_process: use LOCAL_MULTILIB := both
Colin Cross [Thu, 27 Mar 2014 17:26:07 +0000 (17:26 +0000)]
Merge "app_process: use LOCAL_MULTILIB := both"
Colin Cross [Thu, 27 Mar 2014 17:20:29 +0000 (10:20 -0700)]
app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.
Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.
Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
Adam Lesinski [Thu, 27 Mar 2014 17:18:03 +0000 (17:18 +0000)]
am
fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit '
fc680b89184fb60cf9a58e81d7f890002310702d':
Fix a race in NotificationManager with Listeners
Adam Lesinski [Thu, 27 Mar 2014 17:11:35 +0000 (17:11 +0000)]
Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
Olivier Gay [Thu, 27 Mar 2014 16:21:01 +0000 (17:21 +0100)]
Add support for additional international keyboard mappings
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).
Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Narayan Kamath [Thu, 27 Mar 2014 12:50:58 +0000 (12:50 +0000)]
resolved conflicts for merge of
eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
Narayan Kamath [Thu, 27 Mar 2014 12:36:10 +0000 (12:36 +0000)]
am
cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit '
cd3f60f30366a34b4499aab5a47b622069ba9cd6':
AArch64: Make frameworks/base code more portable
Narayan Kamath [Thu, 27 Mar 2014 12:30:53 +0000 (12:30 +0000)]
Merge "AArch64: Make frameworks/base code more portable"
Ashok Bhat [Tue, 25 Mar 2014 20:51:35 +0000 (20:51 +0000)]
AArch64: Make frameworks/base code more portable
Changes in this patch include
[x] Use %zu for size_t, %zd for ssize_t
[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: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
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>
Scott Main [Thu, 27 Mar 2014 09:31:08 +0000 (09:31 +0000)]
am
b5e754dd: am
8ea583a7: am
f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '
b5e754dd4d8accd0c1500008aa1a6dbf178d33d7':
add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
Scott Main [Thu, 27 Mar 2014 09:24:46 +0000 (09:24 +0000)]
am
8ea583a7: am
f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '
8ea583a71aef2f21f833c003a948ca7b1dc32915':
add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
Scott Main [Thu, 27 Mar 2014 09:15:18 +0000 (09:15 +0000)]
am
f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '
f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
Yevgen Pronenko [Fri, 14 Mar 2014 10:57:06 +0000 (11:57 +0100)]
Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.
If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.
To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.
This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402
Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
Scott Main [Thu, 27 Mar 2014 06:24:15 +0000 (06:24 +0000)]
Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
Scott Main [Thu, 27 Mar 2014 03:32:41 +0000 (03:32 +0000)]
am
e0c66e73: am
74b821dc: am
09131844: add viewport width override to each landing page and fix link on homepage
* commit '
e0c66e73b45f228a87086257a9aa7c13361f8b18':
add viewport width override to each landing page and fix link on homepage