51249 Commits

Author SHA1 Message Date
Nicolas Prevot
d85fc72fb8 Resolving resources across users.
When an intent is sent to another profile:
For content uris contained in this intent:
The userId of the source user is added to the userInfo part.
The ActivityManagerService has been modified to resolve resources in the user specified by the uri.
The user id to which the uri belongs to is stored in the UriPermission.

Change-Id: I43dc76895aba692bf148d276253aeaf9c75fce34
2014-05-13 14:59:52 +01:00
Youngsang Cho
c31c450f5d Fix NPE in TvInputService and TvView
Bug: 14781233, Bug: 14629185
Change-Id: I8511674f4f3864b3deaa58f4c95b9c91e68f49f4
2014-05-13 21:28:55 +09:00
Sander Alewijnse
57dacb7eb0 Merge "Group account management methods and add some comments." 2014-05-13 10:30:01 +00:00
Yohei Yukawa
056ffe6d06 Do not send duplicate CursorAnchorInfo to IME
This CL adds an optimization which checks if the same
CursorAnchorInfo is sent to the input method to
prevent these duplicate messages from being sent
unnecessarily.

BUG: 14579622
Change-Id: I451544fba746a766186123b9ac276221e968c8c3
2014-05-13 19:28:59 +09:00
Przemyslaw Szczepaniak
92c6d71dc9 Merge "Add (hidden) TTSEngines#isLocaleSetToDefaultForEngine method." 2014-05-13 09:39:29 +00:00
Sungsoo Lim
2b35a72a69 Handle the crash of TIS.
- Implement DeathRecipient for SessionState.
- Implement onServiceDisconnected.
- Add callback methods for notifying the death of Session.

Bug: 14073482
Change-Id: Ifdc54266a878224844a221f0b52415d0bc378e39
2014-05-13 14:27:09 +09:00
Sungsoo Lim
51391666ee Merge "Replace ComponentName to InputId." 2014-05-13 05:24:37 +00:00
Aaron Whyte
1fb617fecd Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
2014-05-12 22:08:53 -07:00
Youngsang Cho
468971085b Merge "Use copied input events in TvView" 2014-05-13 04:20:48 +00:00
Aaron Whyte
51f110f9d7 am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit 'd67fd6428a2bcaedca79fb96f971dd021e08a651':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:31:48 +00:00
Aaron Whyte
d67fd6428a am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:27:00 +00:00
Aaron Whyte
6af2ef8e25 Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev 2014-05-13 02:24:13 +00:00
Aaron Whyte
d5f010e4e7 Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.

Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
2014-05-13 02:19:10 +00:00
Aaron Whyte
71dfd44c9b am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:55:26 +00:00
Aaron Whyte
064789efc1 am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:49:16 +00:00
Aaron Whyte
24f3d0915e Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 01:44:18 +00:00
Robert Greenwalt
5152c0987d Merge "Add has* utility functions to NetworkCapabilities" 2014-05-13 01:35:02 +00:00
Robert Greenwalt
5c55e3335c Add has* utility functions to NetworkCapabilities
Change-Id: Icf735b778a3956812be522db39c29cf54c757a25
2014-05-12 18:32:22 -07:00
Brian Williammee
1c89ec28fd Merge "Correct comment on putStringSet" 2014-05-13 01:15:49 +00:00
Lorenzo Colitti
0b38f08ede Fix reboot loop.
The multinetwork branch is rebooting on startup with:

E/AndroidRuntime( 1024): *** FATAL EXCEPTION IN SYSTEM PROCESS: NetworkStats
[...]
E/AndroidRuntime( 1024): Caused by: java.lang.NullPointerException: Attempt to read from field 'long android.net.NetworkCapabilities.mNetworkCapabilities' on a null object reference
E/AndroidRuntime( 1024): 	at android.net.NetworkCapabilities.<init>(NetworkCapabilities.java:235)
E/AndroidRuntime( 1024): 	at android.net.BaseNetworkStateTracker.getNetworkCapabilities(BaseNetworkStateTracker.java:103)
E/AndroidRuntime( 1024): 	at com.android.server.ConnectivityService.getAllNetworkState(ConnectivityService.java:1134)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:877)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfaces(NetworkStatsService.java:849)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.access$600(NetworkStatsService.java:139)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService$2.onReceive(NetworkStatsService.java:717)
E/AndroidRuntime( 1024): 	at android.app.LoadedApk$ReceiverDispatcher$Args.run(LoadedApk.java:766)
E/AndroidRuntime( 1024): 	... 4 more

This seems to be due to NetworkCapabilities' copy constructor
not null-checking its argument.  Unbreak things by ignoring null.

Change-Id: Iff3c38e6d72390fa86e51bfce534ebd42a262e19
2014-05-12 18:06:47 -07:00
Jinsuk Kim
43f8a05754 Add a new resource for HDMI-CEC logical device type definition
New integer array containing the list of HDMI-CEC logical device types
which the Android system can host. HdmiControlService gets initialized
with the types given in the list.

Change-Id: Ic6f02e0903814811b9d1a40364a78b8170d8481d
2014-05-13 10:05:29 +09:00
Robert Greenwalt
56e13f2d08 Merge "Add NetworkRequest to the multinetwork API" 2014-05-13 00:54:20 +00:00
Robert Greenwalt
3c0bf5e536 Add NetworkRequest to the multinetwork API
bug:13885501
Change-Id: I7b9a01aadf26b6ff104d088b6e283c838ec4dfac
2014-05-12 17:52:48 -07:00
Brian Williammee
c8b055aa8b Correct comment on putStringSet
Works with both commit and apply.

Bug: 14838826
Change-Id: I86758139aca8fd06123c06544d1901bb394cbf15
2014-05-12 17:52:18 -07:00
Sungsoo Lim
d6672b51c5 Replace ComponentName to InputId.
Change-Id: Ia4b5b7fa3f2dfa68629f78981b4ea7f7017d6504
2014-05-13 09:33:12 +09:00
Aaron Whyte
3f3e3e87e2 Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I0a8641894b41058f53a5bf241763a9a0605244d1
2014-05-12 17:20:02 -07:00
ztenghui
f65bfe3ba4 Merge "Remove the <group> tag" 2014-05-13 00:13:06 +00:00
Robert Greenwalt
f9cb86aebe Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
2014-05-12 16:52:56 -07:00
ztenghui
42008940e7 Remove the <group> tag
Change-Id: I80e9ba3dabb7394db85dcd34539cf534ba3da79d
2014-05-12 16:48:05 -07:00
John Reck
c8ac775659 More native interpolators
Gotta collect 'em all

Change-Id: I3ccc2b5c842b27b906c8a0470fbedc2bf285bc38
2014-05-12 16:42:02 -07:00
Robert Greenwalt
6681e32fff Merge "Add NetworkCapabilities part of API." 2014-05-12 23:32:03 +00:00
Alan Viverette
2feaa1837a Merge "Simplify accessibility display adjustments" 2014-05-12 23:05:48 +00:00
Matthew Williams
30d9badeab Merge "First implementation of the TaskManager internals." 2014-05-12 22:47:30 +00:00
Matthew Williams
6de79e2b17 First implementation of the TaskManager internals.
Sketching out the TaskManagerService, and provide an implementation
of the Connectivity & Time controllers to use as a basis for how the
IdleMode controller will function.

Change-Id: I9163b8b9df1f8a027354720b469a0fb4c8e37194
2014-05-12 15:41:43 -07:00
Etienne Le Grand
1796635f7f Merge "Add wake gesture as a hidden sensor in Sensor.java" 2014-05-12 22:41:19 +00:00
Alan Viverette
e08340645d Simplify accessibility display adjustments
Makes the inversion bit public so apps can be smarter about rendering
images non-inverted (if they are so inclined).

BUG: 14680114
Change-Id: I8ca2b2517af2ffc13446d7e0b4e859c1171e2d0e
2014-05-12 15:26:45 -07:00
Raph Levien
9d9ee3d666 BiDi support for Minikin
This patch plumbs the bidiFlags for the various text drawing and
measurement functions down to Minikin, so that the latter can do layout
in a BiDi-aware manner. With the corresponding changes to Minikin, it
is sufficient to correctly display RTL text in TextViews.

Change-Id: Ie904f297373b9ad418050a474506605c7c127b0f
2014-05-12 15:16:17 -07:00
John Reck
cae6873161 Merge "Add TimeInterpolator support to RNA" 2014-05-12 22:11:00 +00:00
John Reck
315c329544 Add TimeInterpolator support to RNA
Bug: 14678626

Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
2014-05-12 14:41:06 -07:00
George Mount
abb352a941 Change sharedElementName to viewName.
Bug 14624181

Change-Id: Ic98554c257d4115a917481eb50505373f6d58fa8
2014-05-12 13:58:25 -07:00
Chris Wren
bd2db3c766 am 9fca9ecb: Merge "notification ranking infrastructure"
* commit '9fca9ecbf966372d42210f229005de43bf2d3159':
  notification ranking infrastructure
2014-05-12 20:52:02 +00:00
Chris Wren
9bbc0ca0ab Merge "notification ranking infrastructure" 2014-05-12 20:48:44 +00:00
Alan Viverette
481f84c03d Documentation for theme colors
BUG: 14647063
Change-Id: I3121c45bd26ae5e1c22528a255a73047157d393a
2014-05-12 13:00:29 -07:00
Jason Monk
83520b9512 Switch PacUrl storage from String to Uri
Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.

Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
2014-05-12 15:44:32 -04:00
Robert Greenwalt
1448f0540b Add NetworkCapabilities part of API.
Merging to master, adding @hide until we're ready to reveal the API change.

bug:13885501
Change-Id: Ib40e28092e092630bfec557bde77f58eec8ae1c8
2014-05-12 12:12:57 -07:00
Yorke Lee
532c867faa am 05400140: Merge "Fix magnitude of AbsListView nested scrolling offset"
* commit '054001406952e6192508ab68f702ce2be2e4f7b2':
  Fix magnitude of AbsListView nested scrolling offset
2014-05-12 18:46:59 +00:00
Tim Kilbourn
82c93357d0 am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev
* commit '05c581ac4d6f44263891eae94a41a3841634d89c':
  DO NOT MERGE Hide more leanback stuff.
2014-05-12 18:43:41 +00:00
Tim Kilbourn
0ff8f796d9 am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
  DO NOT MERGE Hide leanback packagemanager apis.
2014-05-12 18:43:37 +00:00
Yorke Lee
3c13d685ba Merge "Fix magnitude of AbsListView nested scrolling offset" 2014-05-12 18:41:13 +00:00
Tim Kilbourn
05c581ac4d Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev 2014-05-12 18:41:11 +00:00