OSDN Git Service
Casey Dahlin [Fri, 13 Nov 2015 00:17:12 +0000 (00:17 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am:
376d5f350c am:
7a38be6112
am:
2c19dbeff5
* commit '
2c19dbeff5ef15aaa6e4bfb23dc1fb44631e5036':
Add hidden support for arrays of raw file descriptors
Makoto Onuki [Fri, 13 Nov 2015 00:13:26 +0000 (00:13 +0000)]
Merge "Disallow DA to reset password, also fix all DO checks"
Makoto Onuki [Wed, 11 Nov 2015 20:40:15 +0000 (12:40 -0800)]
Disallow DA to reset password, also fix all DO checks
Now pure DA (not PO, not DO) aren't allowed to change the password
if one is already set.
Also update "isDeviceOwner" check and make sure we always take
user-id into account. If one really wishes to check the package name
only, then use getgetDeviceOwner() instead.
Also change the enforceNotManagedProfile() check to what's more
generic in the FBE world.
Bug
25645900
Bug
25547523
Bug
25643916
Change-Id: I588ecf9452fe3acc1fb0b4ca0457ad662382fcd2
Casey Dahlin [Fri, 13 Nov 2015 00:07:48 +0000 (00:07 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am:
376d5f350c
am:
7a38be6112
* commit '
7a38be61124fb1d75ed73cdd4050ba25047d2b03':
Add hidden support for arrays of raw file descriptors
Filip Gruszczynski [Fri, 13 Nov 2015 00:05:24 +0000 (00:05 +0000)]
Merge "Refactoring: deduplicate surface bounds calculation."
Casey Dahlin [Thu, 12 Nov 2015 23:57:58 +0000 (23:57 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
am:
376d5f350c
* commit '
376d5f350c6618d915338a9927b5d0f5fb61eba8':
Add hidden support for arrays of raw file descriptors
Chong Zhang [Thu, 12 Nov 2015 23:54:33 +0000 (23:54 +0000)]
Merge "Fix lost window warning"
John Reck [Thu, 12 Nov 2015 23:53:46 +0000 (23:53 +0000)]
Merge "Fix flickering issue"
John Reck [Thu, 12 Nov 2015 23:50:56 +0000 (15:50 -0800)]
Fix flickering issue
Bug:
25411780
Partial-revert for now, reopened b/
22565656 to
deal with the memory use in a followup
Change-Id: I1ec636bc811a85eb2dc4f8c91562dc81b6261355
Casey Dahlin [Thu, 12 Nov 2015 23:50:05 +0000 (23:50 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
Chong Zhang [Thu, 12 Nov 2015 22:56:28 +0000 (14:56 -0800)]
Fix lost window warning
Mark activity window as invisible with window manager when it's
destroyed normally, to differentiate with the case where the app
crashed while visible.
bug:
25671369
Change-Id: I26d8df6b7e08fc5b65cd2c7aa432a3c5c8c5c7b3
Siyamed Sinir [Thu, 12 Nov 2015 23:42:39 +0000 (23:42 +0000)]
Merge "TextView.append() honors autoLink attribute"
Joe LaPenna [Thu, 12 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am:
516ac154e1 -s ours am:
4d93d122bd -s ours
am:
76e30f26af -s ours
* commit '
76e30f26afe9b5971028ce10353da5f760f6738a':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:27:43 +0000 (23:27 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am:
6915d809e8 -s ours am:
2d43dd3c0e -s ours
am:
ddf77e14e5 -s ours
* commit '
ddf77e14e5d6a5b8aa61c0a9f82c099468129df7':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Siyamed Sinir [Tue, 10 Nov 2015 23:34:29 +0000 (15:34 -0800)]
TextView.append() honors autoLink attribute
The append() method now checks if autoLink is set and adds the
URLSpans to given text before appending to the existing text.
Fixes https://code.google.com/p/android/issues/detail?id=1244
Fixes https://code.google.com/p/android/issues/detail?id=191353
Bug:
1404366
Bug:
25222125
Change-Id: I47a8beec9799e4f92ce266ceed41a634b7f7cc96
Joe LaPenna [Thu, 12 Nov 2015 23:22:32 +0000 (23:22 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am:
516ac154e1 -s ours
am:
4d93d122bd -s ours
* commit '
4d93d122bd8c9988cb4239d5aec7401f6ee3c54b':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:21:09 +0000 (23:21 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am:
6915d809e8 -s ours
am:
2d43dd3c0e -s ours
* commit '
2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Joe LaPenna [Thu, 12 Nov 2015 23:14:29 +0000 (23:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
am:
516ac154e1 -s ours
* commit '
516ac154e16324d178fc1343293c4b1d5447ef2c':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:13:01 +0000 (23:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am:
6915d809e8 -s ours
* commit '
6915d809e895d29411c0a687bff7fdd391509dc7':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Deepanshu Gupta [Thu, 12 Nov 2015 23:12:59 +0000 (23:12 +0000)]
Improve error reporting on Exceptions in fw views. am:
d30c141a2d
am:
e0c9dd1b4f
* commit '
e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49':
Improve error reporting on Exceptions in fw views.
Chad Brubaker [Thu, 12 Nov 2015 23:11:26 +0000 (23:11 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Chad Brubaker [Thu, 12 Nov 2015 23:10:58 +0000 (23:10 +0000)]
Merge "Support X509TrustManagerExtensions methods" am:
b324fb18d9 am:
8f45b48757
am:
35e8a31bfa
* commit '
35e8a31bfabfecfda738b4f26960da0ea245dc42':
Support X509TrustManagerExtensions methods
Chad Brubaker [Thu, 12 Nov 2015 23:09:53 +0000 (23:09 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Chad Brubaker [Thu, 12 Nov 2015 23:09:05 +0000 (23:09 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am:
9c3982f75d am:
a26cafc2b2
am:
cd03475fc4
* commit '
cd03475fc44ed52939e836b8c3a9426691beedd8':
Use duck typing in X509TrustManagerExtensions
Joe LaPenna [Thu, 12 Nov 2015 23:08:48 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
Joe LaPenna [Thu, 12 Nov 2015 23:08:42 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
Chad Brubaker [Thu, 12 Nov 2015 23:08:22 +0000 (23:08 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Chad Brubaker [Thu, 12 Nov 2015 23:07:20 +0000 (23:07 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am:
9c3982f75d am:
a26cafc2b2
am:
cd03475fc4
* commit '
cd03475fc44ed52939e836b8c3a9426691beedd8':
Use duck typing in X509TrustManagerExtensions
Philip P. Moltmann [Thu, 12 Nov 2015 23:07:04 +0000 (23:07 +0000)]
Merge "Do not disable the add printer icon and have special empty view if no print services are enabled"
Svetoslav Ganov [Thu, 12 Nov 2015 23:03:52 +0000 (23:03 +0000)]
Merge "System crash fixed when turn off MagnificationGesture" am:
8f87949340 am:
1ff9f8ad50
am:
af0596d317 -s ours
* commit '
af0596d3172ce9ccc98aa494d092cd146ce15b05':
System crash fixed when turn off MagnificationGesture
Filip Gruszczynski [Thu, 12 Nov 2015 23:02:38 +0000 (23:02 +0000)]
Merge "Fix recents to freeform animation."
Chong Zhang [Thu, 12 Nov 2015 22:58:52 +0000 (22:58 +0000)]
Merge "Fixes for touch exclusion region"
Deepanshu Gupta [Thu, 12 Nov 2015 22:36:00 +0000 (22:36 +0000)]
Improve error reporting on Exceptions in fw views.
am:
d30c141a2d
* commit '
d30c141a2dee881fd83e1415a50161def1acf227':
Improve error reporting on Exceptions in fw views.
Filip Gruszczynski [Thu, 12 Nov 2015 22:09:26 +0000 (14:09 -0800)]
Fix recents to freeform animation.
We should use freeform animation spec not only when the task is already
freeform, but also when it is entering freeform.
Bug:
25669457
Change-Id: I30cba79a149183b0a8b9e1e4751a215cef6a490f
Casey Dahlin [Thu, 5 Nov 2015 20:19:13 +0000 (12:19 -0800)]
Add hidden support for arrays of raw file descriptors
Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug:
25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
Deepanshu Gupta [Wed, 21 Oct 2015 00:29:44 +0000 (17:29 -0700)]
Improve error reporting on Exceptions in fw views.
When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.
Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).
Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
Chris Craik [Thu, 12 Nov 2015 00:42:34 +0000 (16:42 -0800)]
Recycle OffscreenBuffers
Change-Id: Ia2e219026f211a5308ecf8209c5f986bb888aadd
Chong Zhang [Wed, 11 Nov 2015 22:53:41 +0000 (14:53 -0800)]
Fixes for touch exclusion region
- Evaluate touch exclusion region on per-task basis, instead of per
window. Smallest unit for exclusion is Task, if task has more than
one app window, we still need to use the visible area of the task
to do focus transfer properly.
- Only add back the touch region for focused task after all tasks
are processed for eclusion, otherwise the focused area could be
removed from exclusion incorrectly.
- Skip app windows that's exiting or hidden.
bug:
25494928
Change-Id: I972ba2149431557e7420b1095d9496a6cd821bdb
Philip P. Moltmann [Wed, 11 Nov 2015 23:30:16 +0000 (15:30 -0800)]
Do not disable the add printer icon and have special empty view if no
print services are enabled
The add printer icon is always visible as this is used for both adding
a printer and adding addition print services
We have three different empty views now:
1. No print services
2. No printers found (not search filter set)
3. No printers found (search filter set)
Bug:
24132367
Change-Id: Ic30812b60986f1e0f023488cefc6aa901ce20824
Chad Brubaker [Thu, 12 Nov 2015 19:43:00 +0000 (19:43 +0000)]
Merge "Support X509TrustManagerExtensions methods" am:
b324fb18d9
am:
8f45b48757
* commit '
8f45b487570b5c24eba3b4065f17650e6eb1fd7f':
Support X509TrustManagerExtensions methods
Chad Brubaker [Thu, 12 Nov 2015 19:41:41 +0000 (19:41 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am:
9c3982f75d
am:
a26cafc2b2
* commit '
a26cafc2b2f072086aba2da0f5651fc9af5e6486':
Use duck typing in X509TrustManagerExtensions
Chad Brubaker [Thu, 12 Nov 2015 19:34:52 +0000 (19:34 +0000)]
Merge "Support X509TrustManagerExtensions methods"
am:
b324fb18d9
* commit '
b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
Support X509TrustManagerExtensions methods
Chad Brubaker [Thu, 12 Nov 2015 19:33:31 +0000 (19:33 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"
am:
9c3982f75d
* commit '
9c3982f75da19e2c0e146e7f251514a44412da0c':
Use duck typing in X509TrustManagerExtensions
Chad Brubaker [Thu, 12 Nov 2015 19:28:54 +0000 (19:28 +0000)]
Merge "Support X509TrustManagerExtensions methods"
Chad Brubaker [Thu, 12 Nov 2015 19:28:21 +0000 (19:28 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"
Bart Sears [Thu, 12 Nov 2015 19:21:11 +0000 (19:21 +0000)]
Merge "Revert "Ensuring that fast-alt tab works from Home as well as other apps.""
Bart Sears [Thu, 12 Nov 2015 19:20:31 +0000 (19:20 +0000)]
Revert "Ensuring that fast-alt tab works from Home as well as other apps."
This reverts commit
55ff9de8aed998468caf320a3b7ecb7407e721e1.
Change-Id: I37213ea9bbd43a83835a9de6f873ccd1b549ad17
Dianne Hackborn [Thu, 12 Nov 2015 19:14:56 +0000 (19:14 +0000)]
Merge "Work on issue #
25467052: System lagged out"
Jason Monk [Thu, 12 Nov 2015 18:55:09 +0000 (18:55 +0000)]
Merge "SettingsLib Drawer: Listen to theme about actionbar"
Jason Monk [Thu, 12 Nov 2015 15:52:21 +0000 (10:52 -0500)]
SettingsLib Drawer: Listen to theme about actionbar
Show it or not based on windowNoTitle.
Bug:
25567755
Change-Id: Ie1a6b79eb87dcc101bd76785df7c5330acc54603
Winson Chung [Thu, 12 Nov 2015 18:42:23 +0000 (18:42 +0000)]
Merge "Ensuring that fast-alt tab works from Home as well as other apps."
Doris Liu [Thu, 12 Nov 2015 18:40:54 +0000 (18:40 +0000)]
Merge "Use array instead of vector for test data set"
Doris Liu [Thu, 12 Nov 2015 18:36:28 +0000 (10:36 -0800)]
Use array instead of vector for test data set
Change-Id: I1d3e94c52b8bf0842c21132507b5f55a136a255b
Chris Craik [Thu, 12 Nov 2015 18:29:24 +0000 (18:29 +0000)]
Merge "Add shadow support to new reorderer/renderer"
Alan Viverette [Thu, 12 Nov 2015 18:29:15 +0000 (18:29 +0000)]
Merge "Prevent runtime restart on missing magnification spec accessors"
Winson [Thu, 12 Nov 2015 17:32:10 +0000 (09:32 -0800)]
Ensuring that fast-alt tab works from Home as well as other apps.
Change-Id: I920fdd06d5b9e3e63d197dce5a366a4316361ed5
Andrei Stingaceanu [Thu, 12 Nov 2015 18:12:44 +0000 (18:12 +0000)]
Merge "Wire in the device owner info into the KeyguardStatusView"
Andrei Stingaceanu [Thu, 12 Nov 2015 12:15:56 +0000 (12:15 +0000)]
Wire in the device owner info into the KeyguardStatusView
Display the device owner information if it has been provisioned by
DPC via DevicePolicyManager, else fallback into displaying the
current user owner information (if set).
Change-Id: Ie915d6669ecac06bfa7b57079b9dcd0fac56df57
Alan Viverette [Thu, 12 Nov 2015 17:43:15 +0000 (12:43 -0500)]
Prevent runtime restart on missing magnification spec accessors
The spec property requires an accessible getter and setter. This code
will be removed in a following CL that refactors magnification spec
animation.
Change-Id: Ia8fecf98700d18e62ae30aa437b81b061c9a9542
Philip P. Moltmann [Thu, 12 Nov 2015 17:17:30 +0000 (17:17 +0000)]
Merge "Deal correctly with suggested print attributes"
Filip Gruszczynski [Thu, 12 Nov 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix missing dock divider."
Filip Gruszczynski [Wed, 11 Nov 2015 21:46:04 +0000 (13:46 -0800)]
Refactoring: deduplicate surface bounds calculation.
This merges code from WindowStateAnimator.setSurfaceBoundariesLocked and
WindowStateAnimator.createSurfaceLocked. We calculate the final surface
size and position in both of these methods in very similar way. The
minor differences seem like small mistakes that aren't visible, because
they happen during surface creation and get fixed very soon after when
the boundaries are set.
Change-Id: I321cb17831888f97619b0cae73fdaf9cbbc762fb
Winson Chung [Thu, 12 Nov 2015 16:42:20 +0000 (16:42 +0000)]
Merge "Removing hacks to delay app animations until window animations complete."
Wale Ogunwale [Thu, 12 Nov 2015 16:35:44 +0000 (16:35 +0000)]
Merge "Avoid configuration of callback being reset after relayout." am:
cbcafde45e am:
0170fb8281
am:
f98a6f4101
* commit '
f98a6f41019bf41d57d0681c2e1d6859f8704091':
Avoid configuration of callback being reset after relayout.
Filip Gruszczynski [Wed, 11 Nov 2015 23:58:03 +0000 (15:58 -0800)]
Fix missing dock divider.
When invisible the dock divider would have its bounds adjusted to size
0, 0 and that would be sent to Surface Flinger. When it becomes visible
we immediately adjust the size of the surface, but it's too late for
Surface Flinger and it returns wrong size to the renderer. By not
adjusting the dock divider bounds when it's invisible, Surface Flinger
will always hold good size. The position will be adjusted when the
divider gets visible.
Bug:
25612050
Change-Id: Iab0798d6545ae0f8b46eabfe7e4100079779bd06
Svetoslav Ganov [Thu, 12 Nov 2015 16:09:55 +0000 (16:09 +0000)]
Merge "System crash fixed when turn off MagnificationGesture" am:
8f87949340
am:
1ff9f8ad50
* commit '
1ff9f8ad50d9fd7faed901e5fd5e79f0d3a6250e':
System crash fixed when turn off MagnificationGesture
Wale Ogunwale [Thu, 12 Nov 2015 16:08:34 +0000 (16:08 +0000)]
Merge "Avoid configuration of callback being reset after relayout." am:
cbcafde45e
am:
0170fb8281
* commit '
0170fb8281d4de9364dc51985be26adea3163c0d':
Avoid configuration of callback being reset after relayout.
Svetoslav Ganov [Thu, 12 Nov 2015 16:05:07 +0000 (16:05 +0000)]
Merge "System crash fixed when turn off MagnificationGesture"
am:
8f87949340
* commit '
8f87949340e858ff4e24615709080978b017f644':
System crash fixed when turn off MagnificationGesture
Wale Ogunwale [Thu, 12 Nov 2015 16:01:22 +0000 (16:01 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
am:
cbcafde45e
* commit '
cbcafde45ec28d62ce674d215c0264f41580d9a6':
Avoid configuration of callback being reset after relayout.
Svetoslav Ganov [Thu, 12 Nov 2015 16:00:28 +0000 (16:00 +0000)]
Merge "System crash fixed when turn off MagnificationGesture"
Wale Ogunwale [Thu, 12 Nov 2015 15:55:18 +0000 (15:55 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
Jason Monk [Wed, 28 Oct 2015 18:33:39 +0000 (14:33 -0400)]
Let support preferences use DeviceDefault themes
Change-Id: I5a0f074dfd1b948b1ced9195ae937e2ad80a5f28
Andrei Stingaceanu [Thu, 12 Nov 2015 10:47:07 +0000 (10:47 +0000)]
Merge "Introduce APIs in DPM for setting/getting the device owner info"
Seigo Nonaka [Thu, 12 Nov 2015 06:55:34 +0000 (06:55 +0000)]
Merge "Clear suggestionSpan reference once popup window is closing."
Andre Eisenbach [Thu, 12 Nov 2015 06:16:52 +0000 (06:16 +0000)]
Merge "Move Bluetooth startup to PHASE_ACTIVITY_MANAGER_READY"
riddle_hsu [Thu, 12 Nov 2015 06:07:12 +0000 (14:07 +0800)]
Avoid configuration of callback being reset after relayout.
mPendingConfiguration is a parameter of IWindowSession.relayout.
And IWindowSession.aidl declared "out Configuration outConfig",
it will always create a new configuration for remote side to write.
If remote side does not write (WMS does not have config change),
the new default configuration will be returned.
In original code passes mPendingConfiguration to updateConfiguration
directly, then callbacks (sConfigCallbacks) receive the same
instance of mPendingConfiguration. And because the implementation
of callback may use the configuration after relayout has reset
the configuration to default, then it may have timing that results
"showing hybrid of portrait and landscape modes" which try to fix
in commit
e36d6e27.
To avoid this, always create a copy to updateConfiguration.
MSG_RESIZED_REPORT from dispatchResized also did the same thing.
Related commit:
e36d6e277e49475076b7872d36ea6a5c5b996e9d
694f79b5d1196640d1beb680b7d1fc68e6e77cbd
Change-Id: Ic1abd596e384918224b3a7020583d9a04641cccc
Andre Eisenbach [Thu, 12 Nov 2015 05:43:26 +0000 (21:43 -0800)]
Move Bluetooth startup to PHASE_ACTIVITY_MANAGER_READY
For some reason BluetoothManagerService recently has been unable to bind
to the BluetoothService, causing timeouts, which in turn could lead to
Bluetooth not working immediately after boot.
While refactoring that code, the "get name and address" code was also
removed to make the startup sequence more transparent and easier to
debug.
Bug:
25597150
Change-Id: I62ffe4589a76ea8a6db75e3c7599f149db677ea3
Winson [Thu, 12 Nov 2015 02:11:59 +0000 (18:11 -0800)]
Fixing crash when trying to set thumbnail info.
- The TaskThumbnailInfo can have the same lifecycle as the TaskRecord, and
we should just reset it instead of setting it to null when the thumbnail
is disposed.
Bug:
25652261
Change-Id: I54384e208b19e60d469bf3471dd555f78f04290c
Dianne Hackborn [Wed, 4 Nov 2015 20:32:45 +0000 (12:32 -0800)]
Work on issue #
25467052: System lagged out
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.
Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
Winson [Wed, 11 Nov 2015 18:39:03 +0000 (10:39 -0800)]
Removing hacks to delay app animations until window animations complete.
- We should have been using onEnterAnimationComplete instead, which is
more reliable and respects the window transition developer option.
Change-Id: Ib7cd2868283cfe0e5fc79863818a614375072e0f
Doris Liu [Thu, 12 Nov 2015 01:56:06 +0000 (01:56 +0000)]
Merge "Add hooks in JNI to start using native path parsing"
Doris Liu [Wed, 11 Nov 2015 22:31:13 +0000 (14:31 -0800)]
Add hooks in JNI to start using native path parsing
Change-Id: Iaa0d3c2c1936c248146ed7f186a13e8e79be818e
Erik Kline [Thu, 12 Nov 2015 01:45:00 +0000 (01:45 +0000)]
Merge "Lower NTP timeout from 20 seconds down to 5 seconds"
Makoto Onuki [Thu, 12 Nov 2015 01:39:44 +0000 (01:39 +0000)]
Merge "Revert "Do not call into ActivityManager from DPMS within DPMS lock""
Amith Yamasani [Wed, 11 Nov 2015 20:46:02 +0000 (12:46 -0800)]
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Bug:
25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
(Cherrypicked from
ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c)
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
DO NOT MERGE ANYWHERE 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)
Makoto Onuki [Thu, 12 Nov 2015 01:38:47 +0000 (01:38 +0000)]
Revert "Do not call into ActivityManager from DPMS within DPMS lock"
Bug
25567963
This reverts commit
53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd.
Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127
Eino-Ville Talvala [Thu, 12 Nov 2015 01:38:37 +0000 (01:38 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1 am:
0e57a4d021 am:
7a062ed396
am:
184cefc2ae
* commit '
184cefc2ae33dde0d82a2ee4ed2683b05df9ccc3':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:31:30 +0000 (01:31 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1 am:
0e57a4d021
am:
7a062ed396
* commit '
7a062ed396f6e563766367de70e0d9c6ba615fed':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:25:02 +0000 (01:25 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1
am:
0e57a4d021
* commit '
0e57a4d02199a55db763b10a49f383c395e768c7':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:18:12 +0000 (01:18 +0000)]
Camera: Documentation updates am:
d8407271ff
am:
37e78cf8f1
* commit '
37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:10:07 +0000 (01:10 +0000)]
Camera: Documentation updates
am:
d8407271ff
* commit '
d8407271ffa83d27e9a524f485a0799e422e1fd6':
Camera: Documentation updates
Amith Yamasani [Thu, 12 Nov 2015 00:46:49 +0000 (00:46 +0000)]
Merge "Use correct lock for reading/writing usage stats files"
Jeff Sharkey [Thu, 12 Nov 2015 00:20:27 +0000 (00:20 +0000)]
Merge "More file-based encryption work."
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug:
24540625
Bug:
23908116
Bug:
23051627
Bug:
17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
Daniel Koulomzin [Wed, 11 Nov 2015 23:44:26 +0000 (23:44 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev am:
1090acc958 am:
102e66152a
am:
c549b4fbc4
* commit '
c549b4fbc4fc9330f72050bf92a21ef3e48446e8':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:37:13 +0000 (23:37 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev am:
1090acc958
am:
102e66152a
* commit '
102e66152a51e28920da23e2991281f51f2439ee':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:28:10 +0000 (23:28 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
am:
1090acc958
* commit '
1090acc958add85c1332fc73b66258ea4efba69e':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:23:18 +0000 (23:23 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool.
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052