OSDN Git Service
Mark Lu [Fri, 18 Dec 2015 21:00:42 +0000 (21:00 +0000)]
Fix system watchdog timeout when reading too many usage events. am:
8877120173 am:
370567d1f5
am:
8f968ae1a2
* commit '
8f968ae1a22f940f68ac2bf08c4ffcfde539e93b':
Fix system watchdog timeout when reading too many usage events.
Robert Greenwalt [Fri, 18 Dec 2015 20:59:02 +0000 (20:59 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d am:
c99c41781c am:
b5f6115092
am:
740e5da062
* commit '
740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a':
Check permissions on getDeviceId.
Robert Greenwalt [Fri, 18 Dec 2015 20:57:33 +0000 (20:57 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc am:
5d7bb383b8 am:
50843b1708
am:
15912efe72
* commit '
15912efe72fe27d9ce212d203227687fe8d98867':
Check permissions on getDeviceId.
Amith Yamasani [Fri, 18 Dec 2015 19:59:19 +0000 (19:59 +0000)]
Merge "Fix broken user removal"
Ruben Brunk [Fri, 18 Dec 2015 19:50:24 +0000 (19:50 +0000)]
Merge "Add a framework service tracking VR mode state."
Wale Ogunwale [Fri, 18 Dec 2015 19:47:13 +0000 (19:47 +0000)]
Merge "Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag"
Amith Yamasani [Fri, 18 Dec 2015 19:21:31 +0000 (11:21 -0800)]
Fix broken user removal
Check target user instead of current user, when deciding if
user can be stopped.
Bug:
26207032
Change-Id: Ibf9cb827943f8fbf8fa3b96a9e04c96d11a36d0a
Mark Lu [Fri, 18 Dec 2015 18:45:39 +0000 (18:45 +0000)]
Fix system watchdog timeout when reading too many usage events. am:
8877120173
am:
370567d1f5
* commit '
370567d1f5be189c858836746bd93e7482c9571a':
Fix system watchdog timeout when reading too many usage events.
Robert Greenwalt [Fri, 18 Dec 2015 18:43:05 +0000 (18:43 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d am:
c99c41781c
am:
b5f6115092
* commit '
b5f611509276516eb26d86fe63e845b7148bec86':
Check permissions on getDeviceId.
Wale Ogunwale [Fri, 18 Dec 2015 18:42:42 +0000 (10:42 -0800)]
Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag
Allows us to differentiate between child windows that always want to be
laid-out in the parent frame regardless of multi-windowing mode
(PopupWindows) and those that don't (SurfaceViews).
Bug:
26255254
Change-Id: Icbc245a24f9a38698444196846ddb25016ef7e2a
Robert Greenwalt [Fri, 18 Dec 2015 18:41:23 +0000 (18:41 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc am:
5d7bb383b8
am:
50843b1708
* commit '
50843b1708f7662f9be661001125d91e0ef544d7':
Check permissions on getDeviceId.
Jeff Sharkey [Fri, 18 Dec 2015 18:25:28 +0000 (18:25 +0000)]
Merge changes Ieabfedfd,I7159d757
* changes:
Sometimes to move forward you need to move backwards.
Sometimes to move forward you need to move backwards.
Jeff Sharkey [Fri, 18 Dec 2015 18:24:20 +0000 (11:24 -0700)]
Sometimes to move forward you need to move backwards.
Part B.
Bug:
26118802
Change-Id: Ieabfedfd0ebff5b1f3dc32d1de43aef9974f15d2
Jeff Sharkey [Fri, 18 Dec 2015 18:23:29 +0000 (11:23 -0700)]
Sometimes to move forward you need to move backwards.
Part A.
Bug:
26118802
Change-Id: I7159d757caa92c590c79cacf62128d1324978c46
Ta-wei Yen [Fri, 18 Dec 2015 18:22:10 +0000 (18:22 +0000)]
Merge "Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status"
Filip Gruszczynski [Fri, 18 Dec 2015 18:17:02 +0000 (18:17 +0000)]
Merge "Collect activity starting logic into ActivityStarter class."
Chris Craik [Fri, 18 Dec 2015 18:07:50 +0000 (18:07 +0000)]
Merge "Fix merged op clipping issue"
Chris Craik [Fri, 18 Dec 2015 02:42:44 +0000 (18:42 -0800)]
Fix merged op clipping issue
Change-Id: I48cd5e92f3e62dcd189a4411a71aa7a40ce5498c
Fyodor Kupolov [Fri, 18 Dec 2015 17:22:07 +0000 (17:22 +0000)]
Merge "Use buffering when reading preferred apps"
Fyodor Kupolov [Fri, 18 Dec 2015 17:22:04 +0000 (17:22 +0000)]
Merge "Optimized database creation for a new user"
Filip Gruszczynski [Thu, 17 Dec 2015 22:16:38 +0000 (14:16 -0800)]
Collect activity starting logic into ActivityStarter class.
Change-Id: If1c074d6c278647ec55f2313483945f24aca8b3b
Wale Ogunwale [Fri, 18 Dec 2015 16:44:15 +0000 (16:44 +0000)]
Merge "Correctly set mContainingFrame for PopupWindows in multi-window mode"
Jeff Sharkey [Fri, 18 Dec 2015 16:34:26 +0000 (16:34 +0000)]
Merge "Allow library spec and app configs to be read from odm partition"
Wale Ogunwale [Fri, 18 Dec 2015 16:25:47 +0000 (08:25 -0800)]
Correctly set mContainingFrame for PopupWindows in multi-window mode
For child windows we want to base their containing frame on their
parent frame and not the task bounds.
Bug:
26255254
Change-Id: Ic211c31e69df16fdbdb7b7ba2022379c5f4a87c0
George Mount [Fri, 18 Dec 2015 15:46:31 +0000 (15:46 +0000)]
Merge "Alt-up moves focus to the toolbar in action bar mode."
George Mount [Tue, 15 Dec 2015 21:36:01 +0000 (13:36 -0800)]
Alt-up moves focus to the toolbar in action bar mode.
Bug
24811572
Change-Id: Ie065fa13ba76131e700e73984a99fc60a7aa513c
George Mount [Fri, 18 Dec 2015 15:29:52 +0000 (15:29 +0000)]
Merge "Reset accessibility after Activity enter transition."
Todd Kennedy [Fri, 18 Dec 2015 15:16:19 +0000 (15:16 +0000)]
Merge "Print "Success" on success"
Winson Chung [Fri, 18 Dec 2015 15:03:12 +0000 (10:03 -0500)]
Hiding pinned stack tasks from overview
Bug:
25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3
Daichi Hirono [Fri, 18 Dec 2015 05:33:38 +0000 (05:33 +0000)]
Merge "Show MTP device as root when it has multiple/zero storages."
Daichi Hirono [Wed, 16 Dec 2015 06:03:19 +0000 (15:03 +0900)]
Show MTP device as root when it has multiple/zero storages.
The CL updates MtpDocumentsProvider#queryRoots so that it fetches
devices from Database as well as storages when we don't have storages
under the device, or when we have multiple storages under the device.
BUG=
26120019
Change-Id: Id2b140f00a1d49fa4da7e17d2564dbbaa1795e1e
Wale Ogunwale [Fri, 18 Dec 2015 03:17:57 +0000 (03:17 +0000)]
Merge "Fixed some issues with tasks with the same affinity in different stacks"
Bryce Lee [Fri, 18 Dec 2015 03:01:37 +0000 (19:01 -0800)]
resolve merge conflicts of
6b9e5bf0c2 to master.
Change-Id: Idada49313619533bfeb375ee232c942589457fa4
Tomasz Mikolajewski [Fri, 18 Dec 2015 02:41:30 +0000 (02:41 +0000)]
Merge "Cleanup StubProvider a little."
Tomasz Mikolajewski [Fri, 18 Dec 2015 02:29:48 +0000 (11:29 +0900)]
Cleanup StubProvider a little.
Change-Id: I1d9f1c978850f466ff204bff97a152ba7919a096
Ying Wang [Fri, 18 Dec 2015 01:50:38 +0000 (01:50 +0000)]
Merge "Fix typo in config.xml file" am:
738a557d54
am:
84d1b18b7b
* commit '
84d1b18b7be03f1e15b61adcb543d1a47dec5952':
Fix typo in config.xml file
Wale Ogunwale [Fri, 18 Dec 2015 01:15:29 +0000 (17:15 -0800)]
Fixed some issues with tasks with the same affinity in different stacks
- It is possible for tasks in different stacks to have the same root
affinity. This can be an issue when we are looking for the best task to
launch an acitivty into since there can be a better match in a different
stack based on class name. We now save the task matched by root afinity
and try to find a better match by class name. If we don't find a better
match we use the match based on root affinity.
- For pinned stack we don't allow root affinity matching as no other
task should be launching in the stack based on affinity.
- Correct ASS#moveActivityToStackLocked to use the passed in stack id
instead of the PINNED_STACK_ID.
Bug:
26015860
Change-Id: I6ec44bc97bf3c669c2305a58563518cf9bfc7804
Mark Lu [Fri, 18 Dec 2015 00:18:45 +0000 (16:18 -0800)]
Fix system watchdog timeout when reading too many usage events.
am:
8877120173
* commit '
8877120173fd62d6701822471f06fe84e992c2ae':
Fix system watchdog timeout when reading too many usage events.
Adrian Roos [Fri, 18 Dec 2015 00:03:59 +0000 (00:03 +0000)]
Merge "Fix NPE in processForRemoteInput"
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
BUG:
25355086
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from
4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit
7018f60b06fd0c647ebf13225320d7e15d02e075)
Chris Craik [Thu, 17 Dec 2015 20:58:24 +0000 (12:58 -0800)]
Simplify ClipArea to prefer Rect args
Change-Id: I8af83d01dc5dd8009a0cd235dd8b59dab61d8560
Chris Craik [Thu, 17 Dec 2015 23:31:30 +0000 (23:31 +0000)]
Merge "Correct drawLines annotations"
Robert Greenwalt [Thu, 17 Dec 2015 23:15:09 +0000 (15:15 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d
am:
c99c41781c
* commit '
c99c41781c69d2cfef411c531cf879e84ca62a74':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc
am:
5d7bb383b8
* commit '
5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
Check permissions on getDeviceId.
Chris Craik [Thu, 17 Dec 2015 23:11:24 +0000 (15:11 -0800)]
Correct drawLines annotations
Change-Id: I161e419a3ce427e10d802ba692679ad671e23dde
Robert Greenwalt [Thu, 17 Dec 2015 23:09:11 +0000 (23:09 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f
am:
a652b7161d
* commit '
a652b7161d3069ba9b5650f1caf741d2588de141':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:07:22 +0000 (23:07 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6
am:
064eb2a7cc
* commit '
064eb2a7cc8b811671682018b82c2b63064971ef':
Check permissions on getDeviceId.
Jeff Sharkey [Thu, 17 Dec 2015 23:04:54 +0000 (23:04 +0000)]
Merge "Send LOCKED_BOOT_COMPLETED to background apps."
Robert Greenwalt [Thu, 17 Dec 2015 23:04:24 +0000 (23:04 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe
am:
628b8f1f5f
* commit '
628b8f1f5f6d249e2f222602352d14c40d648d97':
Check permissions on getDeviceId.
Jeff Sharkey [Thu, 17 Dec 2015 23:04:18 +0000 (23:04 +0000)]
Merge "Make printing framework encryption-aware."
Robert Greenwalt [Thu, 17 Dec 2015 23:01:33 +0000 (23:01 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am:
ef58df63d6
* commit '
ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:58:14 +0000 (22:58 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
am:
4557ef32fe
* commit '
4557ef32fe36b6f7ef7918052400d18af51d452f':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:52:58 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Robert Greenwalt [Thu, 17 Dec 2015 22:52:57 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId."
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Todd Kennedy [Thu, 17 Dec 2015 22:46:39 +0000 (14:46 -0800)]
Print "Success" on success
Change-Id: I274e2aa5d840fee4f57f5a4f2f73af01f0587847
Jeff Sharkey [Thu, 17 Dec 2015 22:38:20 +0000 (15:38 -0700)]
Send LOCKED_BOOT_COMPLETED to background apps.
This mirrors how we're treating the normal BOOT_COMPLETED broadcast.
Bug:
26151835
Change-Id: Ibe1df0df8b89aafbe9af073e14fdd428710a6a40
Winson Chung [Thu, 17 Dec 2015 22:33:54 +0000 (22:33 +0000)]
Merge changes Iac20cc7b,I87ce6320
* changes:
Fixing potential issue with wrong task descriptions being loaded.
Refactoring to AnimatedEvent.
Winson Chung [Thu, 17 Dec 2015 17:09:02 +0000 (12:09 -0500)]
Fixing potential issue with wrong task descriptions being loaded.
- Also cleaning up the Task to remove some confusing nomenclature
related to task properties. Now there is a single icon and title,
and we keep a copy of the TaskDescription for future icon loading.
- Also changing a few cases where we should be calling isFreeformTask()
Bug:
26221779
Change-Id: Iac20cc7b4912f76c14232a323981ab2e8f62628a
Michael Wright [Thu, 17 Dec 2015 22:27:35 +0000 (22:27 +0000)]
Merge "Start at the end of the IME dialog list, not one past."
Michael Wright [Thu, 17 Dec 2015 22:19:46 +0000 (17:19 -0500)]
Start at the end of the IME dialog list, not one past.
Bug:
26240994
Change-Id: Ibc20474930d8c796edb3a5d4b75571a045f0a8dd
Adrian Roos [Thu, 17 Dec 2015 00:47:02 +0000 (16:47 -0800)]
Fix NPE in processForRemoteInput
Bug:
26168336
Change-Id: I010fb22caee2edd85cc0263abeb729e6b952ed01
Fyodor Kupolov [Thu, 17 Dec 2015 22:16:51 +0000 (14:16 -0800)]
Use buffering when reading preferred apps
On my test, a buffered version takes 10ms in contrast to 80 ms.
Bug:
26237300
Change-Id: I91ae05798672d243873e7447261156d5ebf3b045
Jeff Sharkey [Thu, 17 Dec 2015 22:12:22 +0000 (15:12 -0700)]
Make printing framework encryption-aware.
Only create UserState objects when a user has been unlocked, meaning
we can connect to the spooler. Ignore package events that occur
while a user is locked, since we'll kick off updateIfNeededLocked()
when that user is eventually unlocked.
In all other cases, throw if someone tries obtaining UserState for
a still-locked user. This should help catch any edge cases in the
system, and communicate clearly through public APIs that printing
isn't available until the user is unlocked.
Bug:
26246836
Change-Id: If15744621890baee206d355484fe20933afc65d8
Julia Reynolds [Thu, 17 Dec 2015 22:12:04 +0000 (22:12 +0000)]
Merge "Allow users to set app-wide Importance default"
Filip Gruszczynski [Thu, 17 Dec 2015 21:54:00 +0000 (21:54 +0000)]
Merge "Use correct SparseArray access method when iterating over it."
Julia Reynolds [Thu, 17 Dec 2015 13:32:48 +0000 (08:32 -0500)]
Allow users to set app-wide Importance default
And the associated ui changes to the notification guts.
Bug:
22451710
Change-Id: I4e0b11e7b24d70b039a432c5e6cd76c9c7cc547c
Jason Monk [Thu, 17 Dec 2015 21:43:07 +0000 (16:43 -0500)]
Small fixes in TileService
Change-Id: I4d10c43d8e40697d144802067fcd4f95d866e4e0
Jeff Sharkey [Thu, 17 Dec 2015 21:28:06 +0000 (21:28 +0000)]
Merge "Make AppWidgets encryption-aware."
Chris Craik [Thu, 17 Dec 2015 21:24:51 +0000 (21:24 +0000)]
Merge "Add temporary switch for new renderer in JNI"
Jeff Sharkey [Thu, 17 Dec 2015 18:19:00 +0000 (11:19 -0700)]
Make AppWidgets encryption-aware.
Only parse and load AppWidget configuration details after a user has
been unlocked. Yell loudly if someone accidentally tries loading
data for a locked user.
Tidy up protected broadcast logic a bit more to handle persistent
processes. Add backwards compatible behavior for APPWIDGET_UPDATE
broadcast simliar to APPWIDGET_CONFIGURE, since some apps are sending
it to themselves.
Add hidden USER_HANDLE extra to a handful of broadcasts to make
logic more consistent.
Bug:
26247049,
26219971
Change-Id: I54e4f2e343488571f9baa1a316962f41186c1a2c
Chris Craik [Wed, 16 Dec 2015 23:57:21 +0000 (15:57 -0800)]
Add temporary switch for new renderer in JNI
bug:
22480459
Change-Id: I6cb19332cb09650f20b1cc2da3473a2618a50b1e
Alan Viverette [Thu, 17 Dec 2015 21:18:25 +0000 (21:18 +0000)]
Merge "Clamp action bar button height to default minimum height"
Filip Gruszczynski [Thu, 17 Dec 2015 21:05:11 +0000 (13:05 -0800)]
Use correct SparseArray access method when iterating over it.
The current code works with a single display, because that display will
have id 0, so the old code will work (get(0) will return that display).
Bug:
26089885
Change-Id: If685c0ff006f353e6d56fd144acbce4d7f1e835b
Alan Viverette [Thu, 17 Dec 2015 20:59:30 +0000 (15:59 -0500)]
Clamp action bar button height to default minimum height
Previously, the fixed size of 56dp would bump the landscape action bar
measured height up to 56dp but leave the minHeight at 48dp, which would
cause the buttons to be aligned incorrectly. Now the buttons are scaled
to fit the action bar.
Change-Id: I47801d1fb072d8801b7bbae5c42be3bdfb819404
Bryce Lee [Thu, 17 Dec 2015 19:56:12 +0000 (19:56 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am:
cf91b45c05 am:
9eaa59a1ff
am:
132814f20d
* commit '
132814f20d2e0920c419042d55c8e50ace827dba':
Add setting for declaring disabled bluetooth profiles.
Wale Ogunwale [Thu, 17 Dec 2015 19:54:40 +0000 (19:54 +0000)]
Merge "Use accessor methods to get/set visibleBehindActivity"
Bryce Lee [Thu, 17 Dec 2015 19:51:17 +0000 (19:51 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am:
cf91b45c05
am:
9eaa59a1ff
* commit '
9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:45:17 +0000 (11:45 -0800)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am:
cf91b45c05
* commit '
cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:40:47 +0000 (19:40 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
Ying Wang [Thu, 17 Dec 2015 19:26:48 +0000 (11:26 -0800)]
Merge "Fix typo in config.xml file"
am:
738a557d54
* commit '
738a557d54153eedc74aee3dfb128f84e8ca13d4':
Fix typo in config.xml file
Julia Reynolds [Thu, 17 Dec 2015 19:15:30 +0000 (19:15 +0000)]
Merge "Aidl it all!"
Ying Wang [Thu, 17 Dec 2015 19:10:13 +0000 (19:10 +0000)]
Merge "Fix typo in config.xml file"
Alan Viverette [Thu, 17 Dec 2015 19:07:29 +0000 (19:07 +0000)]
Merge "Handle null result from getVirtualChildAt()"
Todd Kennedy [Thu, 17 Dec 2015 18:49:08 +0000 (18:49 +0000)]
Merge "revert quick install"
Fyodor Kupolov [Thu, 17 Dec 2015 18:47:33 +0000 (10:47 -0800)]
Optimized database creation for a new user
If the file doesn't exist, database can be kept in memory. It's safe because
the database will be migrated and disposed of immediately after onCreate
finishes.
Bug:
26237300
Change-Id: Ib37c520f28960c8d6b9ce8dd719ffbcc11a97a58
Todd Kennedy [Wed, 16 Dec 2015 22:45:14 +0000 (14:45 -0800)]
revert quick install
bug:
25118622
Change-Id: I61c3a1ea9015599dc45bd9e656f99f6bf8c4ec02
Wale Ogunwale [Thu, 17 Dec 2015 18:27:23 +0000 (10:27 -0800)]
Use accessor methods to get/set visibleBehindActivity
The accessor methods have protection against the stack been
in a detached state. Reading the field directly can lead to
an NPE when the stack is detached.
Bug:
26209403
Change-Id: I66fc1871ea96504cf1bcbc72cae9b564d6527bce
Steve McKay [Thu, 17 Dec 2015 18:29:08 +0000 (18:29 +0000)]
Merge "Eliminate dialog mode from DocumentsUI."
Ruben Brunk [Sat, 5 Dec 2015 00:16:31 +0000 (16:16 -0800)]
Add a framework service tracking VR mode state.
- Implement a "VR mode" that may be enabled by a focused Activity.
- Add a system service that tracks the current VR mode state and notifies
other core framework services of mode changes.
- Extend NotificationListenerService to allow the bind/unbind lifecycle
of specified listeners to be triggered by system events.
Bug:
22855417
Bug:
25479708
Change-Id: I1ac8692bbb5521bb6c7cfb9d2b56b98b720f8568
Gustav Sennton [Thu, 17 Dec 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Allow several valid signatures per WebView provider."
Filip Gruszczynski [Thu, 17 Dec 2015 17:57:49 +0000 (17:57 +0000)]
Merge "Only add noDisplay activities to freeform source tasks."
Filip Gruszczynski [Wed, 16 Dec 2015 21:46:38 +0000 (13:46 -0800)]
Only add noDisplay activities to freeform source tasks.
We started adding noDisplay activities to source tasks to make the
resolver activity show up within the same task bounds as what caused it
to appear. However, in other cases it might cause to add a noDisplay
activity to a task in which we don't expect anything to appear, e.g.
home task when launching from home.
Bug:
26128908
Bug:
26023670
Change-Id: I2f64e82b3c3754cdbcb4cac3f907674344e67e04
Samuel Tan [Thu, 17 Dec 2015 17:55:24 +0000 (09:55 -0800)]
Merge "Add comments to keep Java and native binder PersistableBundle in sync" am:
6de926a7d6
am:
4981ae9083
* commit '
4981ae908349767fee7976cc82c54a7fb00ee4fd':
Add comments to keep Java and native binder PersistableBundle in sync
Samuel Tan [Thu, 17 Dec 2015 17:53:44 +0000 (09:53 -0800)]
Merge "Fix PersistableBundle handling in Parcel.writeValue" am:
d12959193c
am:
d3decff052
* commit '
d3decff052c4f7471a21fbbb116b32586181b391':
Fix PersistableBundle handling in Parcel.writeValue
Samuel Tan [Thu, 17 Dec 2015 17:52:47 +0000 (09:52 -0800)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Samuel Tan [Thu, 17 Dec 2015 17:52:11 +0000 (09:52 -0800)]
Merge "Specify path for native PersistableBundle implementation" am:
477fa220b1
am:
0bc7647f63
* commit '
0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
Specify path for native PersistableBundle implementation
Alan Viverette [Thu, 17 Dec 2015 17:51:53 +0000 (17:51 +0000)]
Merge "Propagate TextView drawable state after resolving RTL drawables"
Steve McKay [Tue, 15 Dec 2015 20:16:21 +0000 (12:16 -0800)]
Eliminate dialog mode from DocumentsUI.
DocumentsActivity to Use standard drawer layout at all display resolutions.
Bug:
26208032
Change-Id: I3b93c81bf97045744074a299e92cdea4aae7628d
Alan Viverette [Thu, 17 Dec 2015 17:42:39 +0000 (12:42 -0500)]
Handle null result from getVirtualChildAt()
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.
Bug:
25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35