OSDN Git Service

android-x86/frameworks-base.git
7 years agoAdded two new RIL commands support
Jack Yu [Thu, 16 Feb 2017 18:33:38 +0000 (10:33 -0800)]
Added two new RIL commands support

Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.

Test: telephony sanity tests
bug: 322238972012503728294587

Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3

7 years agoMerge "Added inputType to Assist API."
TreeHugger Robot [Thu, 2 Mar 2017 03:01:44 +0000 (03:01 +0000)]
Merge "Added inputType to Assist API."

7 years agoMerge "LightService: recover if light hal fails."
Steven Moreland [Thu, 2 Mar 2017 02:21:20 +0000 (02:21 +0000)]
Merge "LightService: recover if light hal fails."

7 years agoMerge "Log user running states"
Fyodor Kupolov [Thu, 2 Mar 2017 01:33:55 +0000 (01:33 +0000)]
Merge "Log user running states"

7 years agoMerge "Fixed some issues with alert window notifications"
TreeHugger Robot [Thu, 2 Mar 2017 01:04:53 +0000 (01:04 +0000)]
Merge "Fixed some issues with alert window notifications"

7 years agoMerge changes Ic4370fa8,I81c43329,Ic563a8fe,I6d4be770,I858d1c95, ...
TreeHugger Robot [Thu, 2 Mar 2017 00:52:48 +0000 (00:52 +0000)]
Merge changes Ic4370fa8,I81c43329,Ic563a8fe,I6d4be770,I858d1c95, ...

* changes:
  Fixed a bug where a wrong notification could be visible
  Fixed a bug where the icon would dissappear
  Continued low-priority group implementation
  Fixed an issue where the minimum height wasn't applied correctly
  Worked around a bug where the view could render blank
  Fixed another memory leak
  Creating the right views for low-priority group children
  Move the inflation away from the statusbar

7 years agoMerge "Clear associated task when starting activity in a new task."
Bryce Lee [Thu, 2 Mar 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Clear associated task when starting activity in a new task."

7 years agoMerge "Remove DocumentsContract.ACTION_BROWSE."
Garfield Tan [Thu, 2 Mar 2017 00:35:54 +0000 (00:35 +0000)]
Merge "Remove DocumentsContract.ACTION_BROWSE."

7 years agoMerge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
Paul Stewart [Thu, 2 Mar 2017 00:27:33 +0000 (00:27 +0000)]
Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
am: 5e10f3d8e3

Change-Id: Idecbc5f6e85c35c8f648dda005d701bf4ebdec82

7 years agoMerge "Fix up EAP-SIM documentation" am: 2142b14a88
Paul Stewart [Thu, 2 Mar 2017 00:22:25 +0000 (00:22 +0000)]
Merge "Fix up EAP-SIM documentation" am: 2142b14a88
am: 32655dfa19

Change-Id: I781b6e586b7925262d529056dd5f403e081a3d80

7 years agoMerge "Fix up EAP-SIM documentation"
Paul Stewart [Thu, 2 Mar 2017 00:12:43 +0000 (00:12 +0000)]
Merge "Fix up EAP-SIM documentation"
am: 2142b14a88

Change-Id: I944734796ea97fded5cc818899ddf7b41cbeca00

7 years agoLog user running states
Fyodor Kupolov [Wed, 1 Mar 2017 23:53:57 +0000 (15:53 -0800)]
Log user running states

Test: manual
Bug: 28278870
Change-Id: I6ce20167e98eb44c838a681471095d00c4a6346d

7 years agoMerge "Fix up EAP-SIM documentation"
Treehugger Robot [Thu, 2 Mar 2017 00:01:32 +0000 (00:01 +0000)]
Merge "Fix up EAP-SIM documentation"

7 years agoMerge "Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am...
Android Build Merger (Role) [Wed, 1 Mar 2017 23:59:13 +0000 (23:59 +0000)]
Merge "Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653 am: 0c4cace2a0  -s ours"

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2...
Tim Zhang [Wed, 1 Mar 2017 23:58:32 +0000 (23:58 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653
am: 0c4cace2a0  -s ours

Change-Id: Icbbbc4f885c3839dcbc6c695c2ee3d16c78abf92

7 years agoMerge "Revert "Remove activity from task if not set properly.""
Bryce Lee [Wed, 1 Mar 2017 23:58:13 +0000 (23:58 +0000)]
Merge "Revert "Remove activity from task if not set properly.""

7 years agoMerge "getTransport checks interface and instance names." am: 7f0300f1e2 am: 7719c1ad0d
Yifan Hong [Wed, 1 Mar 2017 23:46:09 +0000 (23:46 +0000)]
Merge "getTransport checks interface and instance names." am: 7f0300f1e2 am: 7719c1ad0d
am: cf4bd05edd

Change-Id: I9b811571c301f034c06cdbad5c90afe746023173

7 years agoRevert "Remove activity from task if not set properly."
Bryce Lee [Wed, 1 Mar 2017 23:44:43 +0000 (23:44 +0000)]
Revert "Remove activity from task if not set properly."

This reverts commit 0f9bde84a1120a17dc73d107fc7bb8e5c8c6e719.

Reason for revert: causing b/35879503

Change-Id: I06402356ecdb559dcb8342f3a6cca755aea6533a
Fixes: 35879503
Bug: 35034729
Bug: 35035258
Bug: 34179495
Test: manual with repro steps

7 years agoMerge "Support for showing self-managed calls in IncallService." am: 5a33057092 am...
Tyler Gunn [Wed, 1 Mar 2017 23:40:53 +0000 (23:40 +0000)]
Merge "Support for showing self-managed calls in IncallService." am: 5a33057092 am: 8c7d28f163
am: fd0e1a9d93

Change-Id: I88170e214ca6c142e0445a814ad0e76064e72ba7

7 years agoMerge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
nharold [Wed, 1 Mar 2017 23:38:30 +0000 (23:38 +0000)]
Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
am: 3243ec0614

Change-Id: I3da03980792e5fa898b7109dbb2cea7147f7ee94

7 years agoMerge "Remove SystemApi from android.permission.REQUEST_NETWORK_SCORES."
TreeHugger Robot [Wed, 1 Mar 2017 23:34:35 +0000 (23:34 +0000)]
Merge "Remove SystemApi from android.permission.REQUEST_NETWORK_SCORES."

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a
Tim Zhang [Wed, 1 Mar 2017 23:32:07 +0000 (23:32 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a
am: 07acbea653

Change-Id: I0087c756987e31f45a66928e60e5d8d53e26945a

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock."
Tim Zhang [Wed, 1 Mar 2017 23:23:24 +0000 (23:23 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."
am: 4904e7ae2a

Change-Id: I38169c42b5b5600c0e3d00f0342429b3843f88f8

7 years agoMerge "Added auto-fill support for DatePicker and TimePicker."
TreeHugger Robot [Wed, 1 Mar 2017 23:15:31 +0000 (23:15 +0000)]
Merge "Added auto-fill support for DatePicker and TimePicker."

7 years agoMerge "Compute merged configuration changes"
Andrii Kulian [Wed, 1 Mar 2017 23:14:32 +0000 (23:14 +0000)]
Merge "Compute merged configuration changes"

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock."
Treehugger Robot [Wed, 1 Mar 2017 23:13:14 +0000 (23:13 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."

7 years agoFixed some issues with alert window notifications
Wale Ogunwale [Tue, 28 Feb 2017 18:40:27 +0000 (10:40 -0800)]
Fixed some issues with alert window notifications

- Don't hold window manager lock while calling into notification
manager since it can end up calling into activity manager.
- Fixed issue with using checkCallingPermission() to check if the
system has the internal system window permission. This call fails
if it isn't a binder call. Change to use checkCallingorSelfPermission()
instead.
- Fixed class cast exception while getting app icon by using
IconUtilities class to the the drawable to bitmap convertion.

Change-Id: I4ef380618f558a8aac5b152d97536a614040397f
Fixes: 35780846
Fixes: 35846667
Fixes: 35854470
Bug: 35657567
Test: cts/hostsidetests/.../run-test CtsWindowManagerHostTestCases android.server.cts.AlertWindowsTests

7 years agoMerge "IServiceManager/ITokenManager uses "default" service name"
TreeHugger Robot [Wed, 1 Mar 2017 23:05:57 +0000 (23:05 +0000)]
Merge "IServiceManager/ITokenManager uses "default" service name"

7 years agoMerge "Adding flags to filter dumping of activities."
TreeHugger Robot [Wed, 1 Mar 2017 22:39:01 +0000 (22:39 +0000)]
Merge "Adding flags to filter dumping of activities."

7 years agoMerge "Remove AHardwareBuffer_ API from libandroid"
Mathias Agopian [Wed, 1 Mar 2017 22:18:27 +0000 (22:18 +0000)]
Merge "Remove AHardwareBuffer_ API from libandroid"

7 years agoRemove FastJNI optimization on AssetManager to avoid dead lock.
Tim Zhang [Thu, 16 Feb 2017 01:55:27 +0000 (09:55 +0800)]
Remove FastJNI optimization on AssetManager to avoid dead lock.

I found there was a dead lock among main, android.display and GC threads
when running monkey test.
 - Main thread got a mutex and was suspended by GC thread.
 - Android.display thread waited for mutex held by main thread.
 - GC thread waited for suspention of android.display thread.

This will lead to ANR or screen freeze.

Merged-In: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8
Change-Id: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8

7 years agoMerge "Add a debug flag to disable time correction."
Daniel Nishi [Wed, 1 Mar 2017 22:16:46 +0000 (22:16 +0000)]
Merge "Add a debug flag to disable time correction."

7 years agoLightService: recover if light hal fails.
Steven Moreland [Sat, 25 Feb 2017 01:20:37 +0000 (17:20 -0800)]
LightService: recover if light hal fails.

- Also cleaned up implementation.

Fixes: 35728264
Test: killing android.hardware.light@2.0-service, lights still work
Change-Id: I608b85491f3b10864b8591e15537777068ded079

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock."
TreeHugger Robot [Wed, 1 Mar 2017 22:06:12 +0000 (22:06 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."

7 years agoClear associated task when starting activity in a new task.
Bryce Lee [Thu, 23 Feb 2017 17:46:45 +0000 (09:46 -0800)]
Clear associated task when starting activity in a new task.

In the case that an activity is brought to the foreground with clear
top, we will start it at the top of the source record's task. The
current code sets the task to match the found activity, which will no
longer be the case.

This changelist cleans up this reference so that we do not try to
reparent and instead just add the activity to the task.

Change-Id: Ic7428548fa4972aa19bc9ba890c9edaf2ff31220
Fixes: 35318848
Test: manual by bug repo steps (consistently reproducible).

7 years agoMerge "Add QS tile for Night Display when first used"
Christine Franks [Wed, 1 Mar 2017 22:03:51 +0000 (22:03 +0000)]
Merge "Add QS tile for Night Display when first used"

7 years agoMerge "Fix some old and annoying doc problems."
TreeHugger Robot [Wed, 1 Mar 2017 22:03:18 +0000 (22:03 +0000)]
Merge "Fix some old and annoying doc problems."

7 years agoFix up EAP-SIM documentation
Paul Stewart [Fri, 24 Feb 2017 18:21:35 +0000 (10:21 -0800)]
Fix up EAP-SIM documentation

Address API Council comments on doucmentation for the method calls
and constants related to EAP-SIM.  While here, improve unit tests
to ensure that passing a null certificate (chain) causes the config
to forget any existing client certificates.

Bug: 35847887
Test: Unit tests

Change-Id: I1c4e18e1a7cfb61aa4764e32778793368938e70b

7 years agoMerge "Add a network scorer label metadata field to NetworkScoreAppData"
TreeHugger Robot [Wed, 1 Mar 2017 21:54:33 +0000 (21:54 +0000)]
Merge "Add a network scorer label metadata field to NetworkScoreAppData"

7 years agoMerge "getTransport checks interface and instance names." am: 7f0300f1e2
Yifan Hong [Wed, 1 Mar 2017 21:54:14 +0000 (21:54 +0000)]
Merge "getTransport checks interface and instance names." am: 7f0300f1e2
am: 7719c1ad0d

Change-Id: I8fcb35bdd7325e9bcae169f03142499b2490dd19

7 years agoMerge "Support for showing self-managed calls in IncallService." am: 5a33057092
Tyler Gunn [Wed, 1 Mar 2017 21:50:32 +0000 (21:50 +0000)]
Merge "Support for showing self-managed calls in IncallService." am: 5a33057092
am: 8c7d28f163

Change-Id: I201275ad6daf66201eb57f9215c6ec88fe65539e

7 years agoMerge "Use context's userId in ContentResolver class."
TreeHugger Robot [Wed, 1 Mar 2017 21:49:26 +0000 (21:49 +0000)]
Merge "Use context's userId in ContentResolver class."

7 years agoMerge "getTransport checks interface and instance names."
Yifan Hong [Wed, 1 Mar 2017 21:46:05 +0000 (21:46 +0000)]
Merge "getTransport checks interface and instance names."
am: 7f0300f1e2

Change-Id: Ie44e09d89745d2179514c3b9fb8ab80e544e3701

7 years agoMerge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3
nharold [Wed, 1 Mar 2017 21:44:49 +0000 (21:44 +0000)]
Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3
am: 1f7f262920

Change-Id: I9cce740f777f0c881b37cbf4752cd81d7f817a41

7 years agoMerge "Support for showing self-managed calls in IncallService."
Tyler Gunn [Wed, 1 Mar 2017 21:41:04 +0000 (21:41 +0000)]
Merge "Support for showing self-managed calls in IncallService."
am: 5a33057092

Change-Id: I3491e4c099abf8ccc504fcb85109ba1576e34aba

7 years agoMerge changes from topic 'query-fplmn-sync'
nharold [Wed, 1 Mar 2017 21:37:58 +0000 (21:37 +0000)]
Merge changes from topic 'query-fplmn-sync'
am: 0dc62c6dd3

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203

7 years agoMerge "getTransport checks interface and instance names."
Treehugger Robot [Wed, 1 Mar 2017 21:24:24 +0000 (21:24 +0000)]
Merge "getTransport checks interface and instance names."

7 years agoFixed a bug where a wrong notification could be visible
Selim Cinek [Wed, 1 Mar 2017 00:47:50 +0000 (16:47 -0800)]
Fixed a bug where a wrong notification could be visible

Because we were not looking at the wrong state and ignoring
gone.

Test: add 4 notifications, pull down and tap on bottom continuously
Change-Id: Ic4370fa89525802ed99377da215085d84642a174

7 years agoFixed a bug where the icon would dissappear
Selim Cinek [Wed, 1 Mar 2017 00:09:56 +0000 (16:09 -0800)]
Fixed a bug where the icon would dissappear

If we were inflated on the lockscreen as the only child
the icon would dissappear.

Test: send multiple messages, kill systemui, observe
Change-Id: I81c433292f6839920b99ac124ca1dd17eb6e962e

7 years agoContinued low-priority group implementation
Selim Cinek [Sat, 25 Feb 2017 03:06:12 +0000 (19:06 -0800)]
Continued low-priority group implementation

Adapting the low-priority group implementation
according to spec. Expanding a group takes 2 taps now.

Test: add low-priority group observe behavior
Change-Id: Ic563a8fe0e71df746b9b548adc8d1698940b1a83
Fixes: 35125708

7 years agoFixed an issue where the minimum height wasn't applied correctly
Selim Cinek [Sat, 25 Feb 2017 00:27:20 +0000 (16:27 -0800)]
Fixed an issue where the minimum height wasn't applied correctly

Test: send multiple message on same thread, observe normal padding
Change-Id: I6d4be7702de0b749963e236cbfa8c1f351742233
Fixes: 35672249

7 years agoWorked around a bug where the view could render blank
Selim Cinek [Fri, 24 Feb 2017 02:03:37 +0000 (18:03 -0800)]
Worked around a bug where the view could render blank

Heads up notifications could render blank due to a
bug with invalidation. This works around this issue
by manually invalidating the parent.

Change-Id: I858d1c95bc936f5b14fc3485b2d54d76717c2537
Fixes: 34660898

7 years agoFixed another memory leak
Selim Cinek [Fri, 24 Feb 2017 01:01:04 +0000 (17:01 -0800)]
Fixed another memory leak

Clicked heads-up notifications were never released

Test: runtest systemui
Change-Id: I9a1097fd5d26caca25c784905b60ea4b40468b2f

7 years agoCreating the right views for low-priority group children
Selim Cinek [Thu, 23 Feb 2017 04:55:44 +0000 (20:55 -0800)]
Creating the right views for low-priority group children

Previously we always created the low-priority views even if it
was in a group, but now we use the collapsed or the singleline
one based on the group state.

Test: runtest systemui
Bug: 35125708
Change-Id: I49d418912f65c3bc8b672d383eb6a0526fcb8993

7 years agoMove the inflation away from the statusbar
Selim Cinek [Sat, 18 Feb 2017 03:38:40 +0000 (19:38 -0800)]
Move the inflation away from the statusbar

Since the notifications need to inflate more dynamically
based on their own state, the inflation is moved away
from the statusbar.
This also improves the apply inplace logic, that was
reinflating all views even if only a single notification
layout was changed.

Test: runtest systemui
Bug: 35125708
Change-Id: I42a33065ab60b7c45ca979ae2d7baa1518bf92b7

7 years agoMerge "Add tracing for broadcast sending and processing."
Carmen Jackson [Wed, 1 Mar 2017 21:03:10 +0000 (21:03 +0000)]
Merge "Add tracing for broadcast sending and processing."

7 years agoMerge changes I6c0c8730,Icbae30d2
TreeHugger Robot [Wed, 1 Mar 2017 21:02:22 +0000 (21:02 +0000)]
Merge changes I6c0c8730,Icbae30d2

* changes:
  Fix Wifi Signal strength in the picker.
  Create a Tron event for opening the network details page.

7 years agoMerge "Add the new package stats query to wrapper."
Daniel Nishi [Wed, 1 Mar 2017 20:54:55 +0000 (20:54 +0000)]
Merge "Add the new package stats query to wrapper."

7 years agoAdd QS tile for Night Display when first used
Christine Franks [Mon, 23 Jan 2017 22:45:29 +0000 (14:45 -0800)]
Add QS tile for Night Display when first used

Bug: 30994985
Test: runtest systemui, and manual - verify that the quick settings
panel does not have a Night Display quick settings tile, then turn
Night Display on and verify that the tile has appeared. Multiuser
does NOT work and is tracked separately.

Change-Id: I997b4ca7952016fc703a6bb777e500f4eccce189

7 years agoMerge "Support for showing self-managed calls in IncallService."
Tyler Gunn [Wed, 1 Mar 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Support for showing self-managed calls in IncallService."

7 years agoMerge "Add a process state seq counter to UidRecord."
TreeHugger Robot [Wed, 1 Mar 2017 20:28:54 +0000 (20:28 +0000)]
Merge "Add a process state seq counter to UidRecord."

7 years agoMerge changes from topic 'query-fplmn-sync'
nharold [Wed, 1 Mar 2017 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic 'query-fplmn-sync'

* changes:
  Provide a public API for TelephonyManager.getForbiddenPlmns()
  Add support for querying Forbidden PLMNs

7 years agoRemove AHardwareBuffer_ API from libandroid
Mathias Agopian [Wed, 1 Mar 2017 01:02:58 +0000 (17:02 -0800)]
Remove AHardwareBuffer_ API from libandroid

It’s now in libnativewindow. Also tag
ANativeWindow_ symbols as removed (no-op currently)

Test: compiled
Bug: treble
Change-Id: I912a7d09b35f25cf7d33d224f42b9779a3e0ae71

7 years agoRemove DocumentsContract.ACTION_BROWSE.
Garfield Tan [Wed, 1 Mar 2017 19:01:05 +0000 (11:01 -0800)]
Remove DocumentsContract.ACTION_BROWSE.

Test: It builds.
Bug: 35760993
Change-Id: Icdd125d6e6329f703c4682b47b5b9fb80d7e1f27

7 years agoUse context's userId in ContentResolver class.
Sudheer Shanka [Fri, 3 Feb 2017 23:15:57 +0000 (15:15 -0800)]
Use context's userId in ContentResolver class.

- When registering and notifying observers, we should use the user in the
context as opposed to current user.
- Relax the permission check while registering and notifying content observers
to use INTERACT_ACROSS_USERS instead of INTERACT_ACROSS_USERS_FULL permission.

Change-Id: I973936903d4a2272c5722f3b98a057a40c0402be
Fixes: 32955100
Test: Created managed profile and verified that there are not failures.
      runtest -x core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java
      runtest -x core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java

7 years agoMerge "Add method for plugins to reference global dependencies"
TreeHugger Robot [Wed, 1 Mar 2017 19:55:22 +0000 (19:55 +0000)]
Merge "Add method for plugins to reference global dependencies"

7 years agoMerge "Fix vararg build warning"
TreeHugger Robot [Wed, 1 Mar 2017 19:53:21 +0000 (19:53 +0000)]
Merge "Fix vararg build warning"

7 years agoAdd a network scorer label metadata field to NetworkScoreAppData
Stephen Chen [Wed, 1 Mar 2017 02:11:34 +0000 (18:11 -0800)]
Add a network scorer label metadata field to NetworkScoreAppData

This field allows Network Score Services to pass an alternate label for
the scorer.

Bug: 35848510
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java
runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

Change-Id: Ic28671c1663bd08b2406045d20c150a209d56054

7 years agoMerge "Add DUN to networkAttributes" am: 32d763b0ed am: 4e8cd7dca6
Ajay Nambi [Wed, 1 Mar 2017 19:44:48 +0000 (19:44 +0000)]
Merge "Add DUN to networkAttributes" am: 32d763b0ed am: 4e8cd7dca6
am: 5e6147faa0

Change-Id: I2ed7b482916804c783e2fa9e7c053e20e8eb59e7

7 years agoMerge "Add DUN to networkAttributes" am: 32d763b0ed
Ajay Nambi [Wed, 1 Mar 2017 19:39:16 +0000 (19:39 +0000)]
Merge "Add DUN to networkAttributes" am: 32d763b0ed
am: 4e8cd7dca6

Change-Id: I802d4cbb1ca1f04d661047c0f4cc0b650295e65c

7 years agoMerge "Add DUN to networkAttributes"
Ajay Nambi [Wed, 1 Mar 2017 19:35:52 +0000 (19:35 +0000)]
Merge "Add DUN to networkAttributes"
am: 32d763b0ed

Change-Id: I863e700b6b98bc23924d7f146e09c1c2c27f608f

7 years agoMerge "Add DUN to networkAttributes"
Treehugger Robot [Wed, 1 Mar 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Add DUN to networkAttributes"

7 years agoMerge "Move graphicstests to coretests"
Sergey Vasilinets [Wed, 1 Mar 2017 19:20:54 +0000 (19:20 +0000)]
Merge "Move graphicstests to coretests"

7 years agoMerge "Only adjust window layers from WindowLayerController"
TreeHugger Robot [Wed, 1 Mar 2017 19:15:16 +0000 (19:15 +0000)]
Merge "Only adjust window layers from WindowLayerController"

7 years agoCompute merged configuration changes
Andrii Kulian [Wed, 1 Mar 2017 04:28:25 +0000 (20:28 -0800)]
Compute merged configuration changes

When we compute configuration changes to decide whether to relaunch
an activity or just report a coniguration change, we were calculating
task override changes and global changes separately. This results in
incorrect set of detected changes if we're moving between the
displays. E.g. when moving from secondary display to the primary
a lot of override config values change from empty to non-empty.

This CL switches to calculating configuration changes for merged
task configuration (global + overrides).

Bug: 34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Change-Id: Icd6d10a49ab3ef80e00caf92cfd46e491b079d50

7 years agoMerge "Pinned animation: Avoid expensive defensive programming."
TreeHugger Robot [Wed, 1 Mar 2017 19:11:18 +0000 (19:11 +0000)]
Merge "Pinned animation: Avoid expensive defensive programming."

7 years agoAdd a process state seq counter to UidRecord.
Sudheer Shanka [Fri, 24 Feb 2017 00:34:40 +0000 (16:34 -0800)]
Add a process state seq counter to UidRecord.

This seq counter is associated with the process state in UidRecord
and will be incremented whenever the uid state is going from
background to foreground or vice versa.

Bug: 27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I1183d929bc7e0b2c9912de3822eb344d2bb0dcf7

7 years agoAdded auto-fill support for DatePicker and TimePicker.
Felipe Leme [Mon, 27 Feb 2017 20:46:04 +0000 (12:46 -0800)]
Added auto-fill support for DatePicker and TimePicker.

Also fixed some getAutoFillType() implementations to return null
when the view is disabled.

Bug: 33550221
Bug: 35840787
Test: CtsAutoFillServiceTestCases (with new tests) pass
Test: m update-api

Change-Id: I46acc1fb106cf2153515cc1c9567b34cfabd1c62

7 years agoMerge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f...
ashastry [Wed, 1 Mar 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f am: 6c567af893
am: 70e47219b4

Change-Id: Ifc032a2dff3402909805cb122693c85fe90d0b41

7 years agoMerge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f
ashastry [Wed, 1 Mar 2017 18:27:52 +0000 (18:27 +0000)]
Merge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f
am: 6c567af893

Change-Id: I1a891d3d8abbf506a91a0236fa7380cfa143e988

7 years agoAdd method for plugins to reference global dependencies
Jason Monk [Fri, 24 Feb 2017 20:57:05 +0000 (15:57 -0500)]
Add method for plugins to reference global dependencies

The new annotation versioning system allows plugins to share common
global interfaces that can be versioned on their own. To facilitate
this add a static method for plugins to get a hold of dependencies.
To get any dependency a plugin must @Requires it so it can be version
checked.

Test: Plugin that uses the new call.
Change-Id: I8e01260f8fbc14465502d506a7aa08212795ad9b

7 years agoMerge "Permit privileged system apps to send SMS without persisting."
ashastry [Wed, 1 Mar 2017 18:23:49 +0000 (18:23 +0000)]
Merge "Permit privileged system apps to send SMS without persisting."
am: 3d5504724f

Change-Id: I94cbf0ab94401149905290e395ddf71371aac849

7 years agoMerge "Permit privileged system apps to send SMS without persisting."
ashastry [Wed, 1 Mar 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Permit privileged system apps to send SMS without persisting."

7 years agoRemove FastJNI optimization on AssetManager to avoid dead lock.
Tim Zhang [Thu, 16 Feb 2017 01:55:27 +0000 (09:55 +0800)]
Remove FastJNI optimization on AssetManager to avoid dead lock.

I found there was a dead lock among main, android.display and GC threads
when running monkey test.
 - Main thread got a mutex and was suspended by GC thread.
 - Android.display thread waited for mutex held by main thread.
 - GC thread waited for suspention of android.display thread.

This will lead to ANR or screen freeze.

Fixes: 32480078
Test: builds

Change-Id: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8

7 years agoMerge "Add direct sensor report NDK API"
Peng Xu [Wed, 1 Mar 2017 17:58:31 +0000 (17:58 +0000)]
Merge "Add direct sensor report NDK API"

7 years agoMerge "Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43...
Android Build Merger (Role) [Wed, 1 Mar 2017 17:55:35 +0000 (17:55 +0000)]
Merge "Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a am: 756216fdf9"

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
Etan Cohen [Wed, 1 Mar 2017 17:54:35 +0000 (17:54 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed

7 years agoMerge "Fix premultiplied flag for hardware bitmaps"
Sergey Vasilinets [Wed, 1 Mar 2017 17:54:05 +0000 (17:54 +0000)]
Merge "Fix premultiplied flag for hardware bitmaps"

7 years agoMerge "Channels for Frameworks notifications"
Geoffrey Pitsch [Wed, 1 Mar 2017 17:51:19 +0000 (17:51 +0000)]
Merge "Channels for Frameworks notifications"

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
Etan Cohen [Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
am: b50d958c4a

Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb

7 years agoMerge "Modify SurfaceView to use SurfaceFlinger child surfaces."
Rob Carr [Wed, 1 Mar 2017 17:49:23 +0000 (17:49 +0000)]
Merge "Modify SurfaceView to use SurfaceFlinger child surfaces."

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)"
Etan Cohen [Wed, 1 Mar 2017 17:45:42 +0000 (17:45 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)"
Etan Cohen [Wed, 1 Mar 2017 17:39:14 +0000 (17:39 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"

7 years agoMerge "Reduce flakes."
TreeHugger Robot [Wed, 1 Mar 2017 17:37:36 +0000 (17:37 +0000)]
Merge "Reduce flakes."

7 years agoMerge "Avoid deadlock when installing app"
TreeHugger Robot [Wed, 1 Mar 2017 17:30:08 +0000 (17:30 +0000)]
Merge "Avoid deadlock when installing app"

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master am: b455f0deed
Tyler Gunn [Wed, 1 Mar 2017 17:03:04 +0000 (17:03 +0000)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master am: b455f0deed
am: 63700b7a8f  -s ours

Change-Id: I485e67447ad5004410ae1d719a4b48baed606517

7 years agoMerge "Expose isInstantApp() to more callers"
TreeHugger Robot [Wed, 1 Mar 2017 16:58:33 +0000 (16:58 +0000)]
Merge "Expose isInstantApp() to more callers"

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master
Tyler Gunn [Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master
am: b455f0deed

Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master
Tyler Gunn [Wed, 1 Mar 2017 16:44:32 +0000 (08:44 -0800)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master

Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d

7 years agoMerge "Rename android.os.Build so it can be dynamically generated"
Diego Perez [Wed, 1 Mar 2017 16:11:11 +0000 (16:11 +0000)]
Merge "Rename android.os.Build so it can be dynamically generated"