Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,560 Commits 3 Branches 0 Tags
fc986d71caced8a758b74b699e6d8593dfd0bdc4
Commit Graph

35855 Commits

Author SHA1 Message Date
Justin Koh
fc986d71ca resolved conflicts for merge of 32c5f299 to master 
Change-Id: I72656792e109fea82c63a3a42151c024630f5997
 2014-05-13 16:52:17 -07:00
George Mount
11d0415481 Merge "Check for null Drawable in MoveImage" 2014-05-13 23:31:09 +00:00
Justin Koh
32c5f2998f am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes. 
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
  Set KITKAT_WATCH to be level 20, document API specific changes.
 2014-05-13 23:24:33 +00:00
Justin Koh
78b94de4b5 Set KITKAT_WATCH to be level 20, document API specific changes. 
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
 2014-05-13 16:03:18 -07:00
Justin Koh
72a4c15c49 am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 
* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
  Hide new methods in notificationlistenerservice DO NOT MERGE
 2014-05-13 22:45:50 +00:00
Justin Koh
e98122ed5d Hide new methods in notificationlistenerservice DO NOT MERGE 
Hide new methods in notificationlistenerservice for now.
Bug: 14116162

Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
 2014-05-13 15:10:16 -07:00
John Reck
191437447a Merge "Wire up texture atlas" 2014-05-13 21:59:31 +00:00
John Reck
66f0be65a1 Wire up texture atlas 
Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
 2014-05-13 14:54:42 -07:00
Aaron Whyte
8f8c7f413f am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:41:38 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:36:31 +00:00
George Mount
d8d99984c5 Merge "Add view name to Transition matching." 2014-05-13 20:08:20 +00:00
George Mount
30da61d477 Add view name to Transition matching. 
Bug 14625214

Change-Id: Ia1b21e6bd0ea4892b504746e582aeb175e0f0506
 2014-05-13 13:07:06 -07:00
George Mount
e8f5a255e0 Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS" 2014-05-13 19:14:16 +00:00
George Mount
0ab4c72914 Merge "Change sharedElementName to viewName." 2014-05-13 19:13:28 +00:00
Nicolas Prevot
2022597859 Merge "Resolving resources across users." 2014-05-13 17:17:18 +00:00
George Mount
d8cdb8cc2c Check for null Drawable in MoveImage 
Bug 14676155

Change-Id: Ic8d2c3fc471a876f5369e743e60ffb0f238f3eed
 2014-05-13 09:33:54 -07:00
George Mount
5d1be53644 Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS 
Bug 14655908

Change-Id: I60c38aca4a00410b792e2f7ce617ea78c162db55
 2014-05-13 09:25:31 -07:00
John Reck
515396a6b5 Merge "More native interpolators" 2014-05-13 16:17:03 +00:00
Jason Monk
b01c6855c0 Merge "Switch PacUrl storage from String to Uri" 2014-05-13 15:14:50 +00:00
Yohei Yukawa
36b3424820 Merge "Do not send duplicate CursorAnchorInfo to IME" 2014-05-13 14:06:51 +00:00
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
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 3f3e3e87e2.

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