OSDN Git Service
Android Build Merger (Role) [Fri, 7 Apr 2017 23:18:11 +0000 (23:18 +0000)]
Merge "Make a11y node info parceling more robust am:
487d869733 am:
aa2da19dc6" into oc-dev-plus-aosp
Phil Weaver [Fri, 7 Apr 2017 23:17:32 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am:
487d869733
am:
aa2da19dc6
Change-Id: I9d21c5a5975cbf6d3e5096124e29d1e8b03ddc03
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am:
487d869733
am:
27e1f88a28
Change-Id: Ic602da1e45e4e906d9e3475a229886913e5dec16
Phil Weaver [Fri, 7 Apr 2017 23:09:30 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
487d869733
Change-Id: I5c85f0dd279f8263aad5b76cbf51dd9d4e0ef549
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
487d869733
Change-Id: I57d8feb17000692b6b93d976de43362ce3a34001
Shunta Sato [Fri, 7 Apr 2017 22:37:41 +0000 (22:37 +0000)]
Merge "Return to Home stack when a context of tasks launched from Home finished" into oc-dev
am:
d275c9a65c
Change-Id: I04432d298ec4aa604e9615eefb38d4f250839697
Philip P. Moltmann [Fri, 7 Apr 2017 22:36:36 +0000 (22:36 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
am:
5cd4797c7a
Change-Id: Ie76ce6bbdef0b2d9cce0f954bcc1efdfcc9d0149
TreeHugger Robot [Fri, 7 Apr 2017 22:30:59 +0000 (22:30 +0000)]
Merge "Return to Home stack when a context of tasks launched from Home finished" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 22:21:37 +0000 (22:21 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
Jorim Jaggi [Fri, 7 Apr 2017 22:14:59 +0000 (22:14 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
am:
bc4bd823d9
Change-Id: I1c23329a3a18fb58d42c13e91e030f589e19025b
Todd Kennedy [Fri, 7 Apr 2017 22:10:43 +0000 (22:10 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
am:
e467be5e14
Change-Id: Ib3551cf0dce0afc169b89bc504b8f9ef88746423
Wale Ogunwale [Fri, 7 Apr 2017 22:09:30 +0000 (22:09 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
am:
77d23337fb
Change-Id: I6c978ab89f31308e359119e6196df909812b3e77
Mihai Nita [Fri, 7 Apr 2017 22:08:21 +0000 (22:08 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
am:
7354ee76aa
Change-Id: Iec7350226e00bca1acf7e24bbf447f95c53b5c51
TreeHugger Robot [Fri, 7 Apr 2017 22:05:14 +0000 (22:05 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
* changes:
Introduce android.anim thread in system_server
Fix thread booster
TreeHugger Robot [Fri, 7 Apr 2017 22:04:04 +0000 (22:04 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 22:00:40 +0000 (22:00 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:56:32 +0000 (21:56 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
Wei Jia [Fri, 7 Apr 2017 21:54:06 +0000 (21:54 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
am:
4c2a62edb6
Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734
Robert Carr [Fri, 7 Apr 2017 21:52:59 +0000 (21:52 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
am:
ca2622b860
Change-Id: Ibd108646edf7217a9f7656b3c83cd87820649c2d
Wale Ogunwale [Fri, 7 Apr 2017 21:51:50 +0000 (21:51 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
am:
735a5e1438
Change-Id: Ibef3a6f9e14e7bcb7466832bb6fe147afe7d37d0
TreeHugger Robot [Fri, 7 Apr 2017 21:46:34 +0000 (21:46 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:44:45 +0000 (21:44 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:42:46 +0000 (21:42 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
Kevin Chyn [Fri, 7 Apr 2017 21:00:58 +0000 (21:00 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am:
1a199ba7e1
Change-Id: Ie74c7067b38d1e34e5fbc3b3d83cbf692f444a53
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 15:53:41 +0000 (08:53 -0700)]
Show recents at correct time when starting activity in docked stack
Previous logic relied on the returnTo type of the task of the activity
we are launching which can get the wrong signal at times because the
original task might have been started from home, but since we are
already in docked mode it shouldn't cause recents activity to be
launched.
We now decide if recents ability should be shown based on if the home
stack is currently visible at the time we started the new activity.
Also, renamed ActivityStack.getStackVisibilityLocked() to
ActivityStack.shouldBeVisible() since it is used to determine if the
stack should be visible and also so it isn't confused with the new
method ActivityStack.isVisible() which returns true if the stack is
currently visible.
Test: manual
Change-Id: I051e72ce93c886d25526af2afef851c95812ab3e
Fixes:
37005549
Andrii Kulian [Fri, 7 Apr 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
am:
4eab3cb11a
Change-Id: I93855ada112e51892d5978c23de506388593aa9e
Andrii Kulian [Fri, 7 Apr 2017 20:22:54 +0000 (20:22 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
Shunta Sato [Mon, 11 Jul 2016 04:32:52 +0000 (13:32 +0900)]
Return to Home stack when a context of tasks launched from Home finished
When the following conditions happen together, another context in
Application stack was launched unexpectedly:
- There is a context of tasks in Application stack, which is launched
from a task on Home stack.
- All tasks/activities in the context are finishing.
Solution:
Add a condition check to see if the task is NOT one of the task
finishing on-top of the top running task.
Bug:
30883775
Test: manual
Author: Ichitaro Kohara <ichitaro.kohara@sonymobile.com>
Change-Id: I5d6097a7c8dc2733ff684957370c987dd158e329
Charles He [Fri, 7 Apr 2017 20:16:20 +0000 (20:16 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
am:
23a7c1e870
Change-Id: I10b10af2f7caac3bfd2ec9b28335fdf4a1647b2c
Jorim Jaggi [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce android.anim thread in system_server
We create a new thread on which everything is running that
directly impacts window animations, i.e. layout, anim tick and
starting window creation. This is such that any work on
android.display can not lead to jank in the window animation,
specifically lock contention on activity manager lock that blocks
callbacks from android.display into AM can not lead to window
animation jank.
Test: Run animation, take systrace, make sure animation is on
android.anim
Test: AppWindowContainerControllerTestTest: AppWindowContainerControllerTestss
Fixes:
36792959
Change-Id: I5d41419a709b7984724e7053a3afdcc1ffe1aaa2
Charles He [Fri, 7 Apr 2017 20:06:16 +0000 (20:06 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
Todd Kennedy [Fri, 7 Apr 2017 18:38:39 +0000 (11:38 -0700)]
copy 'visbileToInstantApps' setting
Change-Id: I342a133ae8d7f38008cb03706d160e6f2e2cca97
Fixes:
37002720
Test: Start instant app [adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d http://www.realestate.com.au/property-apartment-nsw-pyrmont-
124879602] and see that hitting the 'share' icon works
Roozbeh Pournader [Fri, 7 Apr 2017 19:32:45 +0000 (19:32 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev
am:
91d289903c
Change-Id: Ibeaea13b146e30b5f7d67c49295081632a6a7736
Robert Carr [Fri, 7 Apr 2017 02:53:07 +0000 (19:53 -0700)]
ViewRootImpl: Fix child lifetime.
As far as I can tell this has always been broken. We've always had
intermittent reports of buffer-queue-abandoned as well (a recent bug
came with some reports from N). During onStop SurfaceView relies on
onWindowVisibilityChanged, to trigger a visibility change. At this
point SurfaceView will emit the SurfaceDestroyed callback in order to
stop the client from further use of the Surface. The contract we've
been using with ViewRootImpl is at any point following
Activity.performStop returning the WindowManager was free to destroy
the Surfaces. This is why in setWindowsStopped we destroy the hardware
resources for the ViewRoot. However we aren't dispatching anything to
the SurfaceView. The WindowManager will send an app visibility
notification, but that would go through the handler. This means by the
time we return from Stop, there is no guarantee that the
onWindowVisibilityChanged callbacks have been invoked at all. It
seemed most sensible to dispatch the visibility callbacks directly. We
also ensure that getHostVisibility will return false after this point,
so that performTraversals will not reverse our visibility request if
it occurs again prior to the window visibility notification from the
WindowManager. We also guard against emitting a second window
visibility changed callback in the traversals. I don't know at this
point what value the window visibility notification provides but I
don't feel excited about removing it in this CL at this point in
the development cycle.
Test: Put Chrome in PiP. Turn screen off. No Crash!
Bug:
36561071
Change-Id: Id1673561b2299d477b2761b3ac6afa14eabbf7fb
TreeHugger Robot [Fri, 7 Apr 2017 19:21:51 +0000 (19:21 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 19:14:41 +0000 (19:14 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev
am:
2f2e3f8ad5
Change-Id: I4b2f25475531003f8a4928e0b4a8eef05dfb9378
Wale Ogunwale [Fri, 7 Apr 2017 19:06:50 +0000 (19:06 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev
Ying Xu [Fri, 7 Apr 2017 18:55:11 +0000 (18:55 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
am:
98852767b3
Change-Id: Ia7f57e10f3783a4bf7b711a347c6e64170d64f96
Ying Xu [Fri, 7 Apr 2017 18:47:54 +0000 (18:47 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Bryce Lee [Fri, 7 Apr 2017 18:42:23 +0000 (18:42 +0000)]
Revert "Do not make strong reference to Resources."
This reverts commit
2d2315a66d81d29896e6a0ffedbfbbed3981b9ed.
Reason for revert: possible cause for b/
37156733
Change-Id: I02d468449f0632d1281ab5ad2a381e7e36a5b0ea
Romain Guy [Fri, 7 Apr 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Color management, the missing pieces" into oc-dev
am:
7dfa16c2ef
Change-Id: I258ae87aeb739f3df1d1aef00fb055861c757111
TreeHugger Robot [Fri, 7 Apr 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Color management, the missing pieces" into oc-dev
Geoffrey Pitsch [Fri, 7 Apr 2017 18:28:45 +0000 (18:28 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev
am:
9394a8fc62
Change-Id: Iae8d9273ede243c9261ace763dc321a6196e302f
Gustav Sennton [Fri, 7 Apr 2017 18:22:05 +0000 (18:22 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
am:
fc33499c64
Change-Id: Iefa63e6d00a10647457d197c02975442fade34d7
Geoffrey Pitsch [Fri, 7 Apr 2017 18:16:30 +0000 (18:16 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 18:13:22 +0000 (18:13 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 17:54:00 +0000 (10:54 -0700)]
Add hidden API to check support of Multi-Display
Added ActivityManager#supportsMultiDisplay() to check if system
supports running activities on secondary displays.
Bug:
36776777
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMultiDisplayDisabled
Change-Id: I18f98f2f6a9e865ad8dc63a470210190536d3271
Jason Monk [Fri, 7 Apr 2017 17:49:33 +0000 (17:49 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev
am:
3d82322c7c
Change-Id: I6c7e8a47686d5f3cfa1f4e235ef1bbb94dd753a7
Adrian Roos [Fri, 7 Apr 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
am:
2d691791e7
Change-Id: If8de068e9e42dc8ccac513c3ad624ef38c6ac1dc
TreeHugger Robot [Fri, 7 Apr 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
Jason Monk [Fri, 7 Apr 2017 17:32:19 +0000 (17:32 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev
am:
157017c8a8
Change-Id: Ia6feb2f2e41ce6f4551cd6cd8713e09b0f5c5275
Jason Monk [Fri, 7 Apr 2017 17:31:05 +0000 (17:31 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev
am:
ed8051b528
Change-Id: Ica1d06c345112b7632c9892576edc0c7352ba2bb
TreeHugger Robot [Fri, 7 Apr 2017 17:24:57 +0000 (17:24 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 17:23:31 +0000 (17:23 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev
Philip P. Moltmann [Thu, 6 Apr 2017 02:51:08 +0000 (19:51 -0700)]
Add RecommendationPlugin for Cloud Print
Reuses already existing infrastructure. The mMDNSFilteredDiscovery lambda
is called for every network service that supports #PRIVET_SERVICE. Then
the plugin checks the txt fields to make sure the printer is valid. The
check is not complete but good enough to make sure this is either a
cloud print capable printer or something that tries really hard.
Test: Connected to network with three printers, 2 GCP capable. Found the
two printers
Fixes:
35766193
Change-Id: I7c9180c8c154fa092fec5b943a94bad77da74c86
Mihai Nita [Fri, 7 Apr 2017 15:25:06 +0000 (08:25 -0700)]
AAPT2: fixing the -c flag being ignored
Bug:
36999175
Test: manual
Change-Id: Id9a4a00a3b37bc088d86df7c75bbe711536b980f
Adrian Roos [Fri, 7 Apr 2017 16:14:34 +0000 (16:14 +0000)]
Merge "AOD: More VisD updates" into oc-dev
am:
67ee79e84f
Change-Id: Ie88590d0e098ef447c26cabb230cbf67aadcbb17
Selim Cinek [Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
am:
5393a0e2d9
Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de
TreeHugger Robot [Fri, 7 Apr 2017 16:03:29 +0000 (16:03 +0000)]
Merge "AOD: More VisD updates" into oc-dev
Chen Xu [Fri, 7 Apr 2017 16:03:02 +0000 (16:03 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
am:
31fcda576f
Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
TreeHugger Robot [Fri, 7 Apr 2017 15:59:12 +0000 (15:59 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
* changes:
Improved accessibility behavior of the notification shelf
Fixed a bug where the indeterminate progressbar janky
Chen Xu [Fri, 7 Apr 2017 15:53:07 +0000 (15:53 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
Bryce Lee [Fri, 7 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
am:
13acf25cfd
Change-Id: I58d215ae33994274a364ec71ba59bae25e0e1c12
Bryce Lee [Fri, 7 Apr 2017 14:58:13 +0000 (14:58 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
Romain Guy [Wed, 5 Apr 2017 02:38:50 +0000 (19:38 -0700)]
Color management, the missing pieces
Implement missing color management pieces for bitmaps:
- Bitmap.createBitmap(Bitmap src, ...) now creates a bitmap
in the same color space as the source bitmap
- Bitmap.createScaledBitmap() now creates a bitmap in the
same color space as the source bitmap
- Bitmap.createBitmap(..., ColorSpace colorSpace) to create
bitmaps in a specific color space
- Fix copy from A8 to F16
- Copying bitmaps in F16 or with a color space does not work,
it's currently a limitation in Skia
Bug:
36905374
Test: BitmapColorSpaceTest
Change-Id: I0092fe4432511db50daa3a9393389a9db05e0c2a
Michal Karpinski [Fri, 7 Apr 2017 14:51:29 +0000 (14:51 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
am:
ce7f931793
Change-Id: I40667aac08e8c6c5d2e31640a4667ea577cc8889
TreeHugger Robot [Fri, 7 Apr 2017 14:45:42 +0000 (14:45 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
am:
ca73ff016f
Change-Id: Ife1762e223269271110b5f2357edffaaeb013b1b
Daniel Nicoara [Fri, 7 Apr 2017 14:19:25 +0000 (14:19 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
am:
1daf6cca42
Change-Id: I1daad51d1b0d559e490da30510ba7aa99979666f
TreeHugger Robot [Fri, 7 Apr 2017 14:12:02 +0000 (14:12 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:11:35 +0000 (14:11 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 13:27:33 +0000 (13:27 +0000)]
Merge "Change requestWait API according to request" into oc-dev
am:
ca687ac39a
Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030
TreeHugger Robot [Fri, 7 Apr 2017 13:19:04 +0000 (13:19 +0000)]
Merge "Change requestWait API according to request" into oc-dev
Jorim Jaggi [Fri, 7 Apr 2017 10:16:33 +0000 (12:16 +0200)]
Fix thread booster
If thread was boost priority already before boosting we reset it
to default priority after.
Test: Open app, run systrace, make sure priorities are right
Bug:
36631902
Change-Id: I763be06c0dc68db73548b22f96dd07864a6ace1f
Wale Ogunwale [Thu, 6 Apr 2017 14:09:51 +0000 (07:09 -0700)]
Don't show alert window notifications when in Vr mode.
Change-Id: I6ef60682197f6581fb101598290b2390ea676091
Fixes:
35854095
Test: manual
Gustav Sennton [Thu, 6 Apr 2017 15:18:02 +0000 (16:18 +0100)]
Remove WebView-fallback code for handling the non-functional stub.
We have already removed the non-functional WebView stub, so we can now
remove the logic ensuring that a primary device user could use any
valid WebView package even when a secondary user did not have any
WebView package to choose from (since all device users should always
have a valid package to use as WebView implementation).
Bug:
34730873
Test: run WebViewUpdateServiceTest tests.
Test: Create new user, disable Chrome for that user, ensure WebView
loads for that user and for the primary user.
Change-Id: Ia77cc2efd9e40a157fb5b68a988425ef15508033
Lorenzo Colitti [Fri, 7 Apr 2017 12:48:26 +0000 (12:48 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev
am:
087daa0da5
Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e
TreeHugger Robot [Fri, 7 Apr 2017 12:40:19 +0000 (12:40 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:38:35 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am:
59dd2ebfc1
Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Michal Karpinski [Fri, 7 Apr 2017 09:47:02 +0000 (10:47 +0100)]
Removed unused variables in PerformBackupTask#finalizeBackup()
The unused variables got left behind after changes in ag/
1841867.
Bug:
35994670
Test: it builds
Change-Id: Ic28719dafb83542d7e4c73cb48508d6792d10174
Jakub Pawlowski [Fri, 7 Apr 2017 07:14:36 +0000 (07:14 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am:
7bf58d5975 am:
909f3b108f
am:
bc095f035d
Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a
Jakub Pawlowski [Fri, 7 Apr 2017 07:05:32 +0000 (07:05 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am:
7bf58d5975
am:
909f3b108f
Change-Id: Iba1be10854f9f7c8fd1459150dfdc79ac8eac395
Jakub Pawlowski [Fri, 7 Apr 2017 06:57:30 +0000 (06:57 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am:
7bf58d5975
Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2
Treehugger Robot [Fri, 7 Apr 2017 06:44:48 +0000 (06:44 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
Bryce Lee [Fri, 7 Apr 2017 06:29:24 +0000 (06:29 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
am:
327c0b9f88
Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a
TreeHugger Robot [Fri, 7 Apr 2017 06:20:56 +0000 (06:20 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 05:57:18 +0000 (22:57 -0700)]
Expose package_verifier_user_consent to Instant Apps
Test: manual
Bug:
37119785
Change-Id: I0a6deb96f1267f3f80bcf017d898fcf365515353
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Add NETWORK_STACK permission
Add a new permission that only allows other system services to call
networking related methods. This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.
Bug:
36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
(cherry picked from commit
fa84050a7e51e2a6643ea242b43f16cd6e3114dd)
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Merge "Add NETWORK_STACK permission" am:
b23fabf3fd am:
09146fc440
am:
d6b2e7ac93
Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab
Lorenzo Colitti [Fri, 7 Apr 2017 05:04:49 +0000 (05:04 +0000)]
Merge "Add NETWORK_STACK permission" am:
b23fabf3fd
am:
09146fc440
Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8
Lorenzo Colitti [Fri, 7 Apr 2017 05:00:15 +0000 (05:00 +0000)]
Merge "Add NETWORK_STACK permission"
am:
b23fabf3fd
Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a
Lorenzo Colitti [Fri, 7 Apr 2017 04:51:13 +0000 (04:51 +0000)]
Merge "Add NETWORK_STACK permission"
Bryce Lee [Thu, 6 Apr 2017 17:27:53 +0000 (10:27 -0700)]
Do not make strong reference to Resources.
This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.
Change-Id: I60d767b52de7bbf769f6761f5a3301dd7aff6ddf
Fixes:
36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation
Hugo Benichi [Fri, 7 Apr 2017 03:54:47 +0000 (03:54 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
am:
8ce439a768
Change-Id: Ic5984629c83f4af4175a40b6cb70ad5741ca4e25
TreeHugger Robot [Fri, 7 Apr 2017 03:47:22 +0000 (03:47 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 03:25:37 +0000 (20:25 -0700)]
resolve merge conflicts of
3c002e45dda1 to oc-dev-plus-aosp
Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5