OSDN Git Service

android-x86/frameworks-base.git
7 years agoTrust: Add missing cleanup upon removing user
Adrian Roos [Thu, 3 Nov 2016 21:46:13 +0000 (14:46 -0700)]
Trust: Add missing cleanup upon removing user

Change-Id: I4a1d9d38344aea54d1f0ae6d6834a45b2e73cb1c
Fixes: 31995569

7 years agoMerge "Implement Skia pipelines for OpenGL and Vulkan."
TreeHugger Robot [Thu, 3 Nov 2016 19:59:41 +0000 (19:59 +0000)]
Merge "Implement Skia pipelines for OpenGL and Vulkan."

7 years agoMerge "Reference ctable when adopting pointer in Bitmap"
TreeHugger Robot [Thu, 3 Nov 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Reference ctable when adopting pointer in Bitmap"

7 years agoMerge "update callers to newer Skia APIs"
TreeHugger Robot [Thu, 3 Nov 2016 19:27:43 +0000 (19:27 +0000)]
Merge "update callers to newer Skia APIs"

7 years agoMerge "Updated JNI interface."
Paulo Casanova [Thu, 3 Nov 2016 18:39:02 +0000 (18:39 +0000)]
Merge "Updated JNI interface."

7 years agoMerge "Added Windows support for aapt/JNI."
Paulo Casanova [Thu, 3 Nov 2016 18:38:19 +0000 (18:38 +0000)]
Merge "Added Windows support for aapt/JNI."

7 years agoMerge "Fixed string array resource"
Robert Greenwalt [Thu, 3 Nov 2016 18:23:29 +0000 (18:23 +0000)]
Merge "Fixed string array resource"

7 years agoMerge changes I0d6f2f0c,I278ab8c3
Winson Chung [Thu, 3 Nov 2016 17:48:09 +0000 (17:48 +0000)]
Merge changes I0d6f2f0c,I278ab8c3

* changes:
  Experiment for snapping PIP to closest edge.
  Experiment with allowing tap to break through to interact with the PIP.

7 years agoMerge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev am: 8b85444802
Wyatt Riley [Thu, 3 Nov 2016 17:40:28 +0000 (17:40 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev am: 8b85444802
am: df03f37af4

Change-Id: I5a6573d97c501e56e8133e1dc4cda9dceec2aecc

7 years agoHigh speed GPS/GNSS Navigation Information Block am: 5d5bac8383
Wyatt Riley [Thu, 3 Nov 2016 17:39:18 +0000 (17:39 +0000)]
High speed GPS/GNSS Navigation Information Block am: 5d5bac8383
am: 0021090eb9

Change-Id: I77d910e9cfd33d5b4aeabfa0f2c2db7fa73120b4

7 years agoMerge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
Wyatt Riley [Thu, 3 Nov 2016 17:33:26 +0000 (17:33 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
am: 8b85444802

Change-Id: I44ba889725acdb43e7eea890cc0bfa9fe3c2b5a6

7 years agoHigh speed GPS/GNSS Navigation Information Block
Wyatt Riley [Thu, 3 Nov 2016 17:33:19 +0000 (17:33 +0000)]
High speed GPS/GNSS Navigation Information Block
am: 5d5bac8383

Change-Id: If8e8576f7e18faf6cb45ff228222c0c34be98d6d

7 years agoImplement Skia pipelines for OpenGL and Vulkan.
Stan Iliev [Wed, 26 Oct 2016 14:30:09 +0000 (10:30 -0400)]
Implement Skia pipelines for OpenGL and Vulkan.

Implement Skia pipelines for OpenGL and Vulkan:
base SkiaPipeline, SkiaOpenGLPipeline and SkiaVulkanPipeline.
Write unit tests for SkiaPipeline.

Test: Built and run manually on angler-eng.
Change-Id: Ie02583426cb3547541ad9bf91700602a6163ff58

7 years agoMerge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
TreeHugger Robot [Thu, 3 Nov 2016 17:27:05 +0000 (17:27 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev

7 years agoMerge "resolve merge conflicts of 0d16fa4 to master"
TreeHugger Robot [Thu, 3 Nov 2016 17:15:29 +0000 (17:15 +0000)]
Merge "resolve merge conflicts of 0d16fa4 to master"

7 years agoMerge "Add benchmarks for View inflation"
John Reck [Thu, 3 Nov 2016 17:14:53 +0000 (17:14 +0000)]
Merge "Add benchmarks for View inflation"

7 years agoReference ctable when adopting pointer in Bitmap
sergeyv [Thu, 3 Nov 2016 17:00:32 +0000 (10:00 -0700)]
Reference ctable when adopting pointer in Bitmap

Change-Id: I56aea10928f0ec73756ed055488a3e3516a9096e
Test: manual.
bug:3262125432561595

7 years agoupdate callers to newer Skia APIs
Mike Reed [Thu, 3 Nov 2016 16:54:10 +0000 (12:54 -0400)]
update callers to newer Skia APIs

Test: refactoring CL. Existing unit tests still pass.

Change-Id: I47e73e00f14f78dd9d4c48a142ac9853e7e4cad7

7 years agoresolve merge conflicts of 0d16fa4 to master
Torne (Richard Coles) [Thu, 3 Nov 2016 15:09:34 +0000 (15:09 +0000)]
resolve merge conflicts of 0d16fa4 to master

Change-Id: I3c01fe6f5439885d28c6d28415004b26845f06b0

7 years agoMerge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am...
Richard Coles [Thu, 3 Nov 2016 14:54:09 +0000 (14:54 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a am: 9c47f5c87a
am: 0092dbabe0

Change-Id: Ic1b2d362c582513ba821f6b9035e1ac91dcfa471

7 years agoMerge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am...
Richard Coles [Thu, 3 Nov 2016 14:48:05 +0000 (14:48 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a
am: 9c47f5c87a

Change-Id: Ia5d867468080e0e48a4e5b3c08b1ee627e16cebe

7 years agoMerge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
Richard Coles [Thu, 3 Nov 2016 14:42:08 +0000 (14:42 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am: be19fe5e8a

Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d

7 years agoMerge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
Richard Coles [Thu, 3 Nov 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."

7 years agoMerge "Replace test TODOs with ACTION."
Julia Reynolds [Thu, 3 Nov 2016 13:42:26 +0000 (13:42 +0000)]
Merge "Replace test TODOs with ACTION."

7 years agoStop non-DO devices from disabling network logging
Michal Karpinski [Thu, 3 Nov 2016 10:19:23 +0000 (10:19 +0000)]
Stop non-DO devices from disabling network logging

Bug: 32623860
Change-Id: Ia53ce842fffb2a15c16c9535fbe07421ae7f2578

7 years agoUpdated JNI interface.
Paulo Casanova [Tue, 1 Nov 2016 14:50:46 +0000 (14:50 +0000)]
Updated JNI interface.

Added new "ping" method used to detect if the shared
library has already been loaded.

Fixed a few bugs in the implementation (and now it works
from the Java side).

See http://ag/1590668 for the implementation on devtools.

Test: Done on the tools side
Change-Id: Ifa41073dc3b6ac69cdb9f77e655bf261c3b4c3d1

7 years agoAdded Windows support for aapt/JNI.
Paulo Casanova [Tue, 1 Nov 2016 17:07:06 +0000 (17:07 +0000)]
Added Windows support for aapt/JNI.

This includes copying and slightly modifying
libnativehelper's ScopedUtfChars' implementation.

Test: Done in studio-master-dev
Change-Id: I2aacc67b444668478aaa5bb0db991a201c571d1f

7 years agoMerge "Fix that bouncer is not focusable if shown without notification shade"
Jorim Jaggi [Thu, 3 Nov 2016 04:17:11 +0000 (04:17 +0000)]
Merge "Fix that bouncer is not focusable if shown without notification shade"

7 years agoMerge "The big Keyguard transition refactor (7/n)"
Jorim Jaggi [Thu, 3 Nov 2016 04:14:14 +0000 (04:14 +0000)]
Merge "The big Keyguard transition refactor (7/n)"

7 years agoMerge "Add traces to systrace when binder tracing is enabled"
TreeHugger Robot [Thu, 3 Nov 2016 03:26:50 +0000 (03:26 +0000)]
Merge "Add traces to systrace when binder tracing is enabled"

7 years agoExperiment for snapping PIP to closest edge.
Winson Chung [Thu, 3 Nov 2016 00:28:03 +0000 (17:28 -0700)]
Experiment for snapping PIP to closest edge.

Test: Enable in SysUI tuner, drag PIP.  This is only experimental to help
      figure out what UX we want to keep.

Change-Id: I0d6f2f0c5909d6a76aae4a8fb84c5076f6996fdd

7 years agoFix that bouncer is not focusable if shown without notification shade
Jorim Jaggi [Thu, 3 Nov 2016 01:11:03 +0000 (18:11 -0700)]
Fix that bouncer is not focusable if shown without notification shade

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts.KeyguardLockedTests#testDismissKeyguard_fromShowWhenLocked
Change-Id: Ia300cea18b0ed7c9bfe04f3aa051d8a04a6eaedc

7 years agoExperiment with allowing tap to break through to interact with the PIP.
Winson Chung [Thu, 3 Nov 2016 01:11:36 +0000 (18:11 -0700)]
Experiment with allowing tap to break through to interact with the PIP.

Test: Enable SysUI tuner, tap once on PIP to interact with the activity.
      This is only experimental behaviour, and
      android.server.cts.ActivityManagerPinnedStackTests will be updated
      accordingly if we keep this behavior.

Change-Id: I278ab8c360c44718cfcac0fd761f476a875f9b15

7 years agoMerge "Change findPath() to findDocumentPath() in MtpDocumentsProvider."
Dimitry Ivanov [Thu, 3 Nov 2016 00:27:38 +0000 (00:27 +0000)]
Merge "Change findPath() to findDocumentPath() in MtpDocumentsProvider."

7 years agoHigh speed GPS/GNSS Navigation Information Block
Wyatt Riley [Tue, 1 Nov 2016 14:05:16 +0000 (07:05 -0700)]
High speed GPS/GNSS Navigation Information Block

When speed goes above 400m/s, the GnssLocationProvider will
stop output of location, measurements and navigation message.

Test: Several on device tests, see bug for details

Bug: 31711586
Change-Id: I8bceb9a67b10ac7cf21983bb856ed0608957096a

7 years agoMerge "Cleanup dumpstate for CTS tests"
TreeHugger Robot [Thu, 3 Nov 2016 00:21:27 +0000 (00:21 +0000)]
Merge "Cleanup dumpstate for CTS tests"

7 years agoMake SET_TIME_ZONE permission match SET_TIME
Christopher Tate [Thu, 27 Oct 2016 01:06:42 +0000 (18:06 -0700)]
Make SET_TIME_ZONE permission match SET_TIME

That is, SET_TIME_ZONE is now signature|privileged.

Bug 19129180

Test: dumpsys package to verify assignment; clock app works
Change-Id: Id0e16499a00e1f5cfb5bd4d9fb421f93bb283ee1

7 years agoMerge "[DPM] Management and retrieval of network logs"
TreeHugger Robot [Wed, 2 Nov 2016 23:28:07 +0000 (23:28 +0000)]
Merge "[DPM] Management and retrieval of network logs"

7 years agoChange findPath() to findDocumentPath() in MtpDocumentsProvider.
Garfield Tan [Wed, 2 Nov 2016 23:00:17 +0000 (16:00 -0700)]
Change findPath() to findDocumentPath() in MtpDocumentsProvider.

Test: It builds.
Change-Id: If474e766b5680d49a7557f0e7ee1c039eb4efae0

7 years agoAdd traces to systrace when binder tracing is enabled
Jorim Jaggi [Tue, 1 Nov 2016 23:17:22 +0000 (16:17 -0700)]
Add traces to systrace when binder tracing is enabled

If binder tracing is enabled, we also output the class/method name
to systrace. This is the first step toward a system in which we could
show the full stack trace in systrace.

Test:
adb shell am trace-ipc start
python systrace.py
adb shell am trace-ipc stop

Change-Id: I6d0354c9560c4518c84fb3fdb66219b460e69f67

7 years agoThe big Keyguard transition refactor (7/n)
Jorim Jaggi [Fri, 28 Oct 2016 02:57:08 +0000 (19:57 -0700)]
The big Keyguard transition refactor (7/n)

There was some window animation jank because we ran a layout during
the animation, as the SysUI animations are slightly faster, so we
collapsed the window already during the animation which caused
a layout which caused window animation jank.

Bug: 32057734
Change-Id: I296f961be8cfc39b08859b7d3d41f1e81b2eaaa3

7 years agoMerge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251 am: 0d5da...
Steven Moreland [Wed, 2 Nov 2016 22:39:52 +0000 (22:39 +0000)]
Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251 am: 0d5da175a0
am: 630fc8c4f7

Change-Id: Iac8cf0e85a0595dc87d5118b8150888c866262fe

7 years agoMerge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251
Steven Moreland [Wed, 2 Nov 2016 22:34:30 +0000 (22:34 +0000)]
Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251
am: 0d5da175a0

Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471

7 years agoMerge "Update for hidlized hwservicemanager." am: 8d0c4ed74c
Steven Moreland [Wed, 2 Nov 2016 22:28:28 +0000 (22:28 +0000)]
Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f

7 years agoMerge "Update for hidlized hwservicemanager."
Steven Moreland [Wed, 2 Nov 2016 22:23:45 +0000 (22:23 +0000)]
Merge "Update for hidlized hwservicemanager."
am: 8d0c4ed74c

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa

7 years agoMerge "AAPT: fix error message"
TreeHugger Robot [Wed, 2 Nov 2016 22:18:47 +0000 (22:18 +0000)]
Merge "AAPT: fix error message"

7 years agoMerge "Update for hidlized hwservicemanager."
Treehugger Robot [Wed, 2 Nov 2016 22:17:24 +0000 (22:17 +0000)]
Merge "Update for hidlized hwservicemanager."

7 years agoMerge "Fix IApplicationThread transaction codes."
Sudheer Shanka [Wed, 2 Nov 2016 22:00:26 +0000 (22:00 +0000)]
Merge "Fix IApplicationThread transaction codes."

7 years agoMerge "Iteration on findDocumentPath() API."
Garfield Tan [Wed, 2 Nov 2016 21:59:28 +0000 (21:59 +0000)]
Merge "Iteration on findDocumentPath() API."

7 years agoMerge "Added support for window TYPE_PRESENTATION"
TreeHugger Robot [Wed, 2 Nov 2016 21:50:36 +0000 (21:50 +0000)]
Merge "Added support for window TYPE_PRESENTATION"

7 years agoAdd benchmarks for View inflation
John Reck [Wed, 2 Nov 2016 18:14:47 +0000 (11:14 -0700)]
Add benchmarks for View inflation

Also speed up RenderNode creation:

Use finalizer() instead of NativeAllocationRegistry, this
shaves ~3us off of creation currently

Avoid instanceof, instead have SurfaceView explicitly ask
for updates.

Remove unused method call.

Test: ran benchmarks
Change-Id: I3117fdf72313a4e6a9965baca9f2a8b855c19b34

7 years agoMerge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c am: 3e15d09ed4
neo.chae [Wed, 2 Nov 2016 21:30:36 +0000 (21:30 +0000)]
Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c am: 3e15d09ed4
am: d3a209399a

Change-Id: I2c7272b5f79e029ac88fa6b6acb598bdf68f28e2

7 years agoMerge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c
neo.chae [Wed, 2 Nov 2016 21:25:05 +0000 (21:25 +0000)]
Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c
am: 3e15d09ed4

Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a

7 years agoMerge "Fix idmap leak in zygote process" am: f5ad44b60a
neo.chae [Wed, 2 Nov 2016 21:21:32 +0000 (21:21 +0000)]
Merge "Fix idmap leak in zygote process" am: f5ad44b60a
am: 4720125a3c

Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885

7 years agoCleanup dumpstate for CTS tests
Jorim Jaggi [Wed, 2 Nov 2016 01:22:53 +0000 (18:22 -0700)]
Cleanup dumpstate for CTS tests

Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e

7 years agoMerge "Fix idmap leak in zygote process"
neo.chae [Wed, 2 Nov 2016 21:16:33 +0000 (21:16 +0000)]
Merge "Fix idmap leak in zygote process"
am: f5ad44b60a

Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7

7 years agoMerge "Fix idmap leak in zygote process"
Treehugger Robot [Wed, 2 Nov 2016 21:09:02 +0000 (21:09 +0000)]
Merge "Fix idmap leak in zygote process"

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours...
Brad Ebinger [Wed, 2 Nov 2016 21:05:49 +0000 (21:05 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786  -s ours am: ccec8919fe am: a895383b44
am: 02a42886ac

Change-Id: I5652f26f1a0d2c88c432a3eae0d58ef1477c986c

7 years agoMerge "mediaplayer: add precise argument to seek function"
Wei Jia [Wed, 2 Nov 2016 21:03:19 +0000 (21:03 +0000)]
Merge "mediaplayer: add precise argument to seek function"

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours...
Brad Ebinger [Wed, 2 Nov 2016 21:00:05 +0000 (21:00 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786  -s ours am: ccec8919fe
am: a895383b44

Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours
Brad Ebinger [Wed, 2 Nov 2016 20:55:16 +0000 (20:55 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786  -s ours
am: ccec8919fe

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476

7 years agoMerge "Modify ConnectionServiceAdapter to include Session"
Brad Ebinger [Wed, 2 Nov 2016 20:51:36 +0000 (20:51 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
am: f231db7786  -s ours

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507

7 years agoUpdate for hidlized hwservicemanager.
Steven Moreland [Mon, 24 Oct 2016 20:44:41 +0000 (13:44 -0700)]
Update for hidlized hwservicemanager.

Bug: 32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28

7 years agoMerge "Modify ConnectionServiceAdapter to include Session"
Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"

7 years agoMerge "Replace SkAutoTUnref with sk_sp."
Ben Wagner [Wed, 2 Nov 2016 20:31:58 +0000 (20:31 +0000)]
Merge "Replace SkAutoTUnref with sk_sp."

7 years agoMerge "Add VERSION_CODES.O"
TreeHugger Robot [Wed, 2 Nov 2016 20:27:10 +0000 (20:27 +0000)]
Merge "Add VERSION_CODES.O"

7 years agoAAPT: fix error message
Adam Lesinski [Wed, 2 Nov 2016 20:17:10 +0000 (13:17 -0700)]
AAPT: fix error message

Test: none
Bug:9779154
Change-Id: Iebda7d4f0061cdc51db0103977195964fcc1211d

7 years agoMerge "Fixing issue with PIP while IME is showing."
TreeHugger Robot [Wed, 2 Nov 2016 20:08:29 +0000 (20:08 +0000)]
Merge "Fixing issue with PIP while IME is showing."

7 years agoReplace test TODOs with ACTION.
Julia Reynolds [Wed, 2 Nov 2016 13:54:47 +0000 (09:54 -0400)]
Replace test TODOs with ACTION.

Also call packagemanager less.

Test: runtest
Change-Id: Icff2a5b9e7fff49ef8cf7b643c198707a6089007

7 years agoMerge changes I7ef5921c,I3bbd09c5
TreeHugger Robot [Wed, 2 Nov 2016 19:50:42 +0000 (19:50 +0000)]
Merge changes I7ef5921c,I3bbd09c5

* changes:
  Create test for CategoryManager.
  Backward-compat for DashboardCategory with app use old keys

7 years agoMerge "Power manager always needs to allow wake locks for services, receivers"
Dianne Hackborn [Wed, 2 Nov 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Power manager always needs to allow wake locks for services, receivers"

7 years agoMerge "Make window token add/remove APIs require displayId"
TreeHugger Robot [Wed, 2 Nov 2016 19:34:27 +0000 (19:34 +0000)]
Merge "Make window token add/remove APIs require displayId"

7 years agoMerge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d am: d7df704d98
pengzhicai [Wed, 2 Nov 2016 18:40:00 +0000 (18:40 +0000)]
Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d am: d7df704d98
am: f85e7930d8

Change-Id: I9e85d16bd3edc529a97e4df3b8f90e9fdb2ee486

7 years agoMerge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d
pengzhicai [Wed, 2 Nov 2016 18:34:53 +0000 (18:34 +0000)]
Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d
am: d7df704d98

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6

7 years agoAdd VERSION_CODES.O
Makoto Onuki [Wed, 2 Nov 2016 18:11:32 +0000 (11:11 -0700)]
Add VERSION_CODES.O

So that the framework can do "targetSdk >= O".

Test: Additional hidden constant only. "m"
Change-Id: I6cde68869c3b8bdc8e8b06b7d63f164714fbd2b0

7 years agoMerge "Fix String is empty issue" am: 80af1ba47b
pengzhicai [Wed, 2 Nov 2016 18:29:24 +0000 (18:29 +0000)]
Merge "Fix String is empty issue" am: 80af1ba47b
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7

7 years agoAdded support for window TYPE_PRESENTATION
Wale Ogunwale [Wed, 2 Nov 2016 03:54:46 +0000 (20:54 -0700)]
Added support for window TYPE_PRESENTATION

Switched presentation feature to use new window TYPE_PRESENTATION
and also add its own window token to the display the presentation
is running on. This is needed as window manager no longer allows
tokens to have windows on multiple displays.

Bug: 32566372
Test: Presentation mode works.
Change-Id: I9c2998311b65640743b8e23ec4f10bf1ffbfd785

7 years agoFixing issue with PIP while IME is showing.
Winson Chung [Wed, 2 Nov 2016 17:02:29 +0000 (10:02 -0700)]
Fixing issue with PIP while IME is showing.

- Unifying logic to ensure that the PIP is moved consistently as its
  movement bounds are shifted.  This is done by adding a snap fraction
  which is a fraction relative to one set of movement bounds, and applied
  to a new movement bounds.  This is flexible to work with all of the
  current snap modes being tested.
- Fixing issue where you can drag out of bounds when touching the PIP
  before the IME shows.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackOffsetForIME
Change-Id: Ie68c1ca599f6196726b8224585974a0972b93701
Signed-off-by: Winson Chung <winsonc@google.com>
7 years agoMerge "Fix String is empty issue"
pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]
Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b

7 years agoMerge "Fix String is empty issue"
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix String is empty issue"

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master...
Brad Ebinger [Wed, 2 Nov 2016 17:54:08 +0000 (17:54 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e am: c50005ee6c
am: 1d35eee461

Change-Id: Icd422298d0d0372b969ce9cca481314980dc83d8

7 years agoresolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp am: c5eacceb3f
Brad Ebinger [Wed, 2 Nov 2016 17:51:51 +0000 (17:51 +0000)]
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp am: c5eacceb3f
am: baa73944e4

Change-Id: I6d636ee7464a9dea03f2ad2f9474d23627c0b6f3

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master...
Brad Ebinger [Wed, 2 Nov 2016 17:47:30 +0000 (17:47 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e
am: c50005ee6c

Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea

7 years agoresolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
Brad Ebinger [Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)]
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
am: c5eacceb3f

Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0

7 years agoMerge changes from topic 'skia_merge'
TreeHugger Robot [Wed, 2 Nov 2016 17:45:18 +0000 (17:45 +0000)]
Merge changes from topic 'skia_merge'

* changes:
  Adding changes required by the master-skia merge.
  use SkBlendMode

7 years agoPower manager always needs to allow wake locks for services, receivers
Dianne Hackborn [Wed, 2 Nov 2016 17:41:53 +0000 (10:41 -0700)]
Power manager always needs to allow wake locks for services, receivers

The change to not allow wake locks for idle apps was a little too
aggressive, since we allow apps that are currently executing services
or receivers to be idle.  (Idle means that it hasn't been in the
foreground for X amount of time, but services and receivers don't count
as being in the foreground.)

So this takes in to account the actual procstate of the uid to determine
if it should actually respect the current idle state.

Test: manual

Change-Id: I32949124b37875b13233478719abccb8369e47f6

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
Brad Ebinger [Wed, 2 Nov 2016 17:43:49 +0000 (17:43 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798

7 years agoFix IApplicationThread transaction codes.
Sudheer Shanka [Tue, 1 Nov 2016 01:45:57 +0000 (18:45 -0700)]
Fix IApplicationThread transaction codes.

(IBinder.FIRST_CALL_TRANSACTION=1) is added to the specified
transaction codes during binder generation. Correct transaction
Ids in IApplicationThread taking this into account.

Bug: 30977067
Test: Verified that the transactions in generated binder have
      correct Ids.
Change-Id: Id1f6ce59814ed559cafda01be0d55c78d52e50e2

7 years agoMerge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev...
Android Build Merger (Role) [Wed, 2 Nov 2016 17:38:07 +0000 (17:38 +0000)]
Merge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712 am: a3c03ba74a am: a79c39d53e"

7 years agoMerge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2...
Phil Weaver [Wed, 2 Nov 2016 17:37:28 +0000 (17:37 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712 am: a3c03ba74a
am: a79c39d53e

Change-Id: I59187a1105553b08e424de7e239533693ae2ecd8

7 years agoMerge "Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c...
Android Build Merger (Role) [Wed, 2 Nov 2016 17:37:04 +0000 (17:37 +0000)]
Merge "Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06 am: b8a314427b am: 1b5e3d98d2"

7 years agoRevert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06...
Phil Weaver [Wed, 2 Nov 2016 17:36:24 +0000 (17:36 +0000)]
Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06 am: b8a314427b
am: 1b5e3d98d2

Change-Id: I91a54e6f1f4d94da93b47cc79a8fdda5a8ae8580

7 years agoMerge "Implement Binder shell command for settings provider."
Dianne Hackborn [Wed, 2 Nov 2016 17:35:39 +0000 (17:35 +0000)]
Merge "Implement Binder shell command for settings provider."

7 years agoresolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
Brad Ebinger [Wed, 2 Nov 2016 17:28:54 +0000 (10:28 -0700)]
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp

Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034

7 years agoCreate test for CategoryManager.
Fan Zhang [Tue, 1 Nov 2016 22:36:25 +0000 (15:36 -0700)]
Create test for CategoryManager.

- Move SettingsLibTests to tests/integ
- Create a new robotests directory for SettingsLib.
- Add test cases for CategoryManager#backwardCompatCleanupForCategory

Bug: 32382487
Test: make RunSettingsLibRoboTests
Change-Id: I7ef5921ce8c47a3e1e7209be1abc97ea549a2378

7 years agoMerge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2...
Phil Weaver [Wed, 2 Nov 2016 17:31:45 +0000 (17:31 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712
am: a3c03ba74a

Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc

7 years agoRevert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06
Phil Weaver [Wed, 2 Nov 2016 17:30:48 +0000 (17:30 +0000)]
Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06
am: b8a314427b

Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486

7 years agoMake window token add/remove APIs require displayId
Wale Ogunwale [Tue, 1 Nov 2016 22:43:46 +0000 (15:43 -0700)]
Make window token add/remove APIs require displayId

Window tokens can now only be on one display, so we now require clients
that want to add/remove window tokens to specify the display they would
like the token to be created on. This simplifies the token handling code
in WM and will be useful moving forward for clients that want to add
windows to external displays.

Test: Existing tests pass
Change-Id: I6b2d8d58a913b3624f1a9a7bebbb99315613f103

7 years agoMerge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2...
Phil Weaver [Wed, 2 Nov 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff
am: 9bfdce4712

Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b

7 years agoRevert "Don't invalidate list data during layout." am: 866ded50bb
Phil Weaver [Wed, 2 Nov 2016 17:25:17 +0000 (17:25 +0000)]
Revert "Don't invalidate list data during layout." am: 866ded50bb
am: 96b4a68c06

Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470