OSDN Git Service

android-x86/frameworks-base.git
7 years agoPrevent crash dialogs from appearing in demo mode
Christine Franks [Wed, 2 Aug 2017 00:13:43 +0000 (17:13 -0700)]
Prevent crash dialogs from appearing in demo mode

Bug: 62712426
Test: runtest -p com.android.server.am frameworks-services
Change-Id: I73162e6cabfc57ecf549c772fb4d00eb862814fb

7 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
Paul Mclean [Tue, 1 Aug 2017 15:28:27 +0000 (15:28 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
Maggie Lee [Tue, 1 Aug 2017 15:03:39 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
am: d88f4b723d

Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581

7 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
am: 502986f72a

Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931

7 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
Hugo Benichi [Tue, 1 Aug 2017 14:55:26 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d  -s ours am: ff55799950  -s ours
am: 17e2448c26  -s ours

Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6

7 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
am: b5da08a276

Change-Id: I5d96dd73affe79880583347e32a95be8510a5462

7 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
am: 9295f58d26

Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7

7 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am: 33676dddbd

Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29

7 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d  -s ours
am: ff55799950  -s ours

Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70

7 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev

7 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am: f18599a15b

Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f

7 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am: 456b91561d  -s ours

Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad

7 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev

* changes:
  DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
  DO NOT MERGE ANYWHERE ConnectivityService: safer locking

7 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:22 +0000 (14:00 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:01:20 +0000 (06:01 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 1 Aug 2017 02:03:43 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idd7fe75cda287243462dc045eff8f3ab2511bd47
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 01:41:18 +0000 (01:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours
am: 6b2d37ca25  -s ours

Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0

7 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours
am: 65d806d043  -s ours

Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b

7 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am: a053eaa841  -s ours

Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2

7 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev

7 years agoMerge "Show error code in WFC error notification." into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev

7 years agoMerge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev

7 years agopower: gps: add gps read timeout
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout

During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.

Bug: 33469278

Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
7 years agoFine-tune the condition to hide IME switcher
Yohei Yukawa [Mon, 31 Jul 2017 22:37:14 +0000 (15:37 -0700)]
Fine-tune the condition to hide IME switcher

This is a follow up CL to a previous CL [1] that aimed to avoid
redundant IME switcher icon/notification on the keyguard, which already
has a keyboard icon to show IME switcher.

What the previous attempt overlooked is that when some other window is
shown over the keyguard and accepting text input, then we instead may
want to show the IME switcher icon/notification in the system UI level
because such a window may or may not have the icon to show IME
switcher.

This CL addresses above case by checking whether the keyguard is also
occluded or not.  Bug 64224022 is also filed to find any other better
solution to stop relying on the keyguard visibility.

 [1]: Ibee9123f4a520e77f4baf8bdd3d75364ab451100
      2c93efc9eb188532472edc9e0c3e1ab8121aa20d

Test: Manually done as follows
      1. Enable multiple IMEs
      2. Set a password to lockscreen
      3. Lock screen
      4. Make sure that IME switcher UI is not shown when typing
         password on the keyguard (Bug 5858903 is still fixed)
      5. Show any window that has EditText over the keyguard
      6. Focus in to that EditText
      7. Make sure that IME switcher UI is shown
Fixes: 63585213
Change-Id: I2ae7fc7676e5b64d8910dbc6833d3042e8d2329a

7 years agoMerge "Camera2: Release input surface on capture session close" into oc-dr1-dev
Eino-Ville Talvala [Mon, 31 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 31 Jul 2017 22:11:31 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I668e6f2c9663628bc4451ac15f73af46088431c3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Remove extraneous invalidate call that unregisters AssetManagers" into oc...
Adam Lesinski [Mon, 31 Jul 2017 22:08:30 +0000 (22:08 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev

7 years agoMerge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 21:43:44 +0000 (21:43 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev

7 years agoDO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously...
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)

There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit ad4d1d8e28618546953e75d4983335631feb6f2a)

Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23

7 years agoMerge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:51:17 +0000 (18:51 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev

7 years agoMerge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev

7 years agoMerge "Do not call onConfigurationChanged for appBound position changes." into oc...
Bryce Lee [Mon, 31 Jul 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev

7 years agoDisable AOD when accessibility color inversion is on.
Geoffrey Pitsch [Fri, 28 Jul 2017 19:07:39 +0000 (15:07 -0400)]
Disable AOD when accessibility color inversion is on.

White background drains too much to be always on.

Bug: 62918778
Test: Manual
Change-Id: I78b2f6a5951b108aff4f353dabe2493117032dce

7 years agoCamera2: Release input surface on capture session close
Eino-Ville Talvala [Mon, 31 Jul 2017 16:57:15 +0000 (09:57 -0700)]
Camera2: Release input surface on capture session close

Per the documentation, the input surface of a reprocessable capture
session should be abandoned on the close of a session.

Actually implement this, to avoid unintentional leaks of buffers.

Test: Camera CTS passes
Bug: 38313948
Change-Id: Ia45c39ea925288a5082d6e722ff4b40c55971a37

7 years agoMerge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 16:43:07 +0000 (16:43 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev

7 years agoDo not call onConfigurationChanged for appBound position changes.
Bryce Lee [Fri, 28 Jul 2017 15:33:36 +0000 (08:33 -0700)]
Do not call onConfigurationChanged for appBound position changes.

Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.

To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.

Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes: 63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke

7 years agoAllow foreground AppWindowToken to influence orientation.
Bryce Lee [Sat, 29 Jul 2017 03:48:43 +0000 (20:48 -0700)]
Allow foreground AppWindowToken to influence orientation.

It is possible for an activity to request an orientation after
finish has been called, causing the system orientation to be
re-evaluated. Since the activity is closing, it will no longer be
eligible to influence orientation. If another stack/task is brought
to the foreground, it will as well won't be able to participate
since it is not considered an opening app and won't be visible. As a
result, we set the orientation to unspecified, leading to the
foreground activity to be resumed in the wrong orientation.

This changelist addresses the issue by allowing an AppWindowToken to
participate in orientation calculations if it is not closing and is
on top of the wm hierarchy, regardless of its visibility.

Change-Id: I0f316d6d824398d084c7648cf2dc2c2d07b4410d
Fixes: 63982461
Fixes: 63513655
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testGetOrientation
Test: go/wm-smoke

7 years agoWakeAndUnlock: Make sure blanking is never animated
Adrian Roos [Mon, 31 Jul 2017 13:56:24 +0000 (15:56 +0200)]
WakeAndUnlock: Make sure blanking is never animated

Fixes an issue where instead of immediately blanking the screen upon
authenticating via fingerprint we animated to blank because another
animating transition was requested at the same time.

Change-Id: I141079c0d4de1776c8328057d364eeb0964eebaf
Fixes: 64080116
Test: Unlock via fingerprint a lot. Verify no flicker.

7 years agoMerge "AOD: When prox covered disable touch during pulse instead of aborting" into...
Adrian Roos [Mon, 31 Jul 2017 12:29:44 +0000 (12:29 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Scrim opacity must satisfy GAR" into oc-dr1-dev
TreeHugger Robot [Sat, 29 Jul 2017 23:08:04 +0000 (23:08 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev

7 years agoMerge "Fix issue where clock inflation would fail" into oc-dr1-dev
TreeHugger Robot [Sat, 29 Jul 2017 22:56:28 +0000 (22:56 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev

7 years agoMerge "Fix BLE scan leaks" into oc-dr1-dev
TreeHugger Robot [Sat, 29 Jul 2017 22:08:36 +0000 (22:08 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev

7 years agoMerge "Add a missing null check" into oc-dev
Jeff Sharkey [Sat, 29 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Add a missing null check" into oc-dev
am: 101fca656d

Change-Id: Iab72d9b62042ab5ceb0d32425b43796d3bdeb1ca

7 years agoMerge "Add a missing null check" into oc-dev
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev

7 years agoMerge "Force update wifi QS when opening." into oc-dr1-dev
TreeHugger Robot [Sat, 29 Jul 2017 09:10:12 +0000 (09:10 +0000)]
Merge "Force update wifi QS when opening." into oc-dr1-dev

7 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS...
Wei Wang [Sat, 29 Jul 2017 03:00:11 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am: a763fdba09  -s ours am: 452b8f2bd3  -s ours
am: f173b2a4c3  -s ours

Change-Id: Id129412a62ee25b95853d664371d6a1b46bda1b0

7 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS...
Wei Wang [Sat, 29 Jul 2017 02:52:46 +0000 (02:52 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am: a763fdba09  -s ours
am: 452b8f2bd3  -s ours

Change-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398

7 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Wei Wang [Sat, 29 Jul 2017 02:46:12 +0000 (02:46 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
am: a763fdba09  -s ours

Change-Id: Id38ed8a73decbf2dc3ce4e657e69fe838acb50c1

7 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.

Test: manual

Bug:36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
(cherry picked from commit c5706f651a0462e9ae5a91c9a026d44710b1f8ea)

7 years agoFix exceptions causing HTC dongle (and JBL headset) to fail connection logic.
Paul McLean [Sat, 29 Jul 2017 00:36:15 +0000 (17:36 -0700)]
Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic.

Bug: 64108509
Test: Manual

Change-Id: I9574f34cea4ff9ef3e18553a138f1a8b95b1b108

7 years agoMerge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
Hugo Benichi [Fri, 28 Jul 2017 23:42:59 +0000 (23:42 +0000)]
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev

7 years agoFix BLE scan leaks
Vinay Kalia [Fri, 28 Jul 2017 22:09:57 +0000 (15:09 -0700)]
Fix BLE scan leaks

If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.

BUG: 62389939
BUG: 38198694

Test: Tested applications which started multiple scans with
       same callback.

Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8

7 years agoRemove extraneous invalidate call that unregisters AssetManagers
Adam Lesinski [Fri, 28 Jul 2017 23:31:00 +0000 (16:31 -0700)]
Remove extraneous invalidate call that unregisters AssetManagers

We are already taking care of updating AssetManagers affected by
path changes to a running app's ApplicationInfo. There is no need
to invalidate ALL AssetManagers, thereby unregistering them
from ResourcesManager and preventing configuration changes from
reaching them.

Bug: 64004601
Test: manual
Change-Id: I39311ec9b1dfd34eb7025836f75c92e0516bc36b

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 28 Jul 2017 23:10:01 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 23:01:43 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2230a1ada1b5ed588ea593eaf975325114edc5b4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoAdd a missing null check
Svet Ganov [Fri, 28 Jul 2017 22:35:06 +0000 (15:35 -0700)]
Add a missing null check

Test: manual

bug::62755026

Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09

7 years agoMerge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev
Sergey Vasilinets [Fri, 28 Jul 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev

7 years agoHandle case for missing permissions - fix NPE
Svet Ganov [Fri, 28 Jul 2017 21:22:57 +0000 (21:22 +0000)]
Handle case for missing permissions - fix NPE
am: 39cc33f192

Change-Id: I8fd46e293a25ddf83346950e8e700ec9d61e2263

7 years agoHandle case for missing permissions - fix NPE
Svet Ganov [Fri, 28 Jul 2017 20:10:33 +0000 (13:10 -0700)]
Handle case for missing permissions - fix NPE

Test: manual

Bug:62755026

Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8

7 years agoMerge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
Andrew Solovay [Fri, 28 Jul 2017 20:18:29 +0000 (20:18 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I57763d6980b66ef288788153d275cf196fbd510a

7 years agoMerge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
Andrew Solovay [Fri, 28 Jul 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 19:09:57 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iafc4fa769c2dfdd065858d02c4ef06d9f3f3f345
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Add new config to tell us whether brightness is bucketed or continuous" into...
TreeHugger Robot [Fri, 28 Jul 2017 18:32:59 +0000 (18:32 +0000)]
Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev

7 years agoFix issue where clock inflation would fail
Lucas Dupin [Fri, 28 Jul 2017 18:07:00 +0000 (11:07 -0700)]
Fix issue where clock inflation would fail

Inflation would fail because the theme being used for casting
didn't define some attributes required by the clock.

Test: Cast to a TV, lock device, clock still visible on the TV.
Change-Id: Ia046da29cfe5b70f5d32667ed6a70adc6dfb0345
Fixes: 63617525

7 years agoMerge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
Bryce Lee [Fri, 28 Jul 2017 17:57:09 +0000 (17:57 +0000)]
Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev

7 years agoMerge "Fix error color states and alphas and sizes of lock screen icons" into oc...
TreeHugger Robot [Fri, 28 Jul 2017 17:47:50 +0000 (17:47 +0000)]
Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev

7 years agoMerge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
Benjamin Miller [Fri, 28 Jul 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f

Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7

7 years agoMerge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev
Jason Monk [Fri, 28 Jul 2017 17:24:12 +0000 (17:24 +0000)]
Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev

7 years agoMerge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
TreeHugger Robot [Fri, 28 Jul 2017 17:11:28 +0000 (17:11 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev

7 years agoMerge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc...
TreeHugger Robot [Fri, 28 Jul 2017 17:10:03 +0000 (17:10 +0000)]
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev

7 years agoScrim opacity must satisfy GAR
Lucas Dupin [Thu, 27 Jul 2017 03:29:38 +0000 (20:29 -0700)]
Scrim opacity must satisfy GAR

Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java

7 years agoMerge "Fix recents split-screen icon" into oc-dr1-dev
Jason Monk [Fri, 28 Jul 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Fix recents split-screen icon" into oc-dr1-dev

7 years agoReport permission flags for all protections based on SDK
Svetoslav Ganov [Fri, 28 Jul 2017 16:42:59 +0000 (16:42 +0000)]
Report permission flags for all protections based on SDK
am: adb8c522a8

Change-Id: Ia30269ec2097d5978ae3e0b3930a38b3f4441ea4

7 years agoMerge "Add AsyncTask to compiled classes" into oc-dr1-dev
Mathieu Chartier [Fri, 28 Jul 2017 16:33:18 +0000 (16:33 +0000)]
Merge "Add AsyncTask to compiled classes" into oc-dr1-dev

7 years agoMerge "QS Tweaks" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 16:00:10 +0000 (16:00 +0000)]
Merge "QS Tweaks" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 15:16:38 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoRevert "NavBar: Don't reorient as much, its a waste of work"
Jason Monk [Fri, 28 Jul 2017 15:08:27 +0000 (11:08 -0400)]
Revert "NavBar: Don't reorient as much, its a waste of work"

This reverts commit 19d2865dd5f0155f31bc715c0f6142ea50d9e00a.

Change-Id: I4ec532fc2d06b0e39a5acff88b8d503064e06cfa
Bug: 63605852

7 years agoRemove rotation and app bounds from Configuration diff.
Bryce Lee [Thu, 27 Jul 2017 21:06:22 +0000 (14:06 -0700)]
Remove rotation and app bounds from Configuration diff.

The presence of these new flags leads to issues with application that
do not expect their presence. Since these flags can appear at
critical times, such as on orientation change, these issues are
brought to the surface often.

This CL remedies this problem by first removing the rotation
property. It is not used and the original issue of orientation and
Configuration alignment has been addressed. For app bounds, the CL
reverts the behavior back to identifying diffs as a screen size
change.

Fixes: 64004417
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke

Change-Id: I1fabb564dfb5c13d897336708523cf7cd5099fa0

7 years agoNav haptics: increase threshold to 150 and don't do on long clicks
Jason Monk [Fri, 28 Jul 2017 14:46:39 +0000 (10:46 -0400)]
Nav haptics: increase threshold to 150 and don't do on long clicks

Test: touch
Change-Id: I1014670036400c0c8e2db4afd63ecfaf103f6fb7
Fixes: 62655913

7 years agoMerge "AOD: Fix more flickering" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 14:40:45 +0000 (14:40 +0000)]
Merge "AOD: Fix more flickering" into oc-dr1-dev

7 years agoMerge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 14:17:01 +0000 (14:17 +0000)]
Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev

7 years agoMerge "AOD: Increase alpha values when dozing" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 13:08:13 +0000 (13:08 +0000)]
Merge "AOD: Increase alpha values when dozing" into oc-dr1-dev

7 years agoAOD: When prox covered disable touch during pulse instead of aborting
Adrian Roos [Wed, 26 Jul 2017 14:20:30 +0000 (16:20 +0200)]
AOD: When prox covered disable touch during pulse instead of aborting

Fixes a UX issue where covering the prox would abort dozing. This
was done to prevent falsing and save power, but in practice results
in a frustrating experience when the proximity sensor is covered
transiently when reaching for the device.

Instead, just ignore touch while the sensor is covered.

Change-Id: Id70f8605c6c7a37288a383d587025bb9b4191b42
Fixes: 64007762
Test: Trigger AOD2, cover sensor. Verify phone stays on but double tap does nothing.

7 years agoDon't freeze display if it isn't okay to animate.
Wale Ogunwale [Thu, 27 Jul 2017 21:14:23 +0000 (14:14 -0700)]
Don't freeze display if it isn't okay to animate.

In window manager world you freeze the display because you want to
do a rotation animation and that has the effect to allowing anything
to influence the display orientation while the display is frozing.
However, when the display is being turned off with the power button
we still want the lockscreen to influence the display orientation so
there is no rotation animation when the screen comes one.
We already have a concept okToAnimate() used to determine if we should
run animations. We now also use it to determine if we should freeze the
display since freezing the display is a result of want to running a
rotation animation.

Fixes: 63760853
Test: Repro. steps from bug.
Test: go/wm-smoke
Change-Id: I9abeda1bd0018f519772f0edce05ea8025efbbbe

7 years agoAOD: Fix more flickering
Adrian Roos [Thu, 27 Jul 2017 14:33:39 +0000 (16:33 +0200)]
AOD: Fix more flickering

Fixes an issue where waking up with fingerprint would not work correctly
if the keyguard was not locked.

Also fixes flickering when triggering the Assistant on AOD.

To achieve the above, also ensures that whenever the scrim is visible, the status bar window is expanded.

Finally, log the alpha and tint of the scrims to systrace.

Fixes: 63983663
Fixes: 63065774
Bug: 63531607
Test: Disable power key locks immediately, trigger AOD, unlock with fingerprint. Verify no flicker; Trigger Assistant from AOD in various scenarios. Verify no flicker.

Change-Id: I0db2938afdde23c1995f6ac905d4a6abdf25cdec

7 years agoDocs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
Benjamin Miller [Mon, 24 Jul 2017 08:11:39 +0000 (10:11 +0200)]
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting

VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN

Test: make ds-docs and output staged UserManager page
Bug: 63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
(cherry picked from commit 1f83e4d498f4a4f2c8796cdefe330a4caf258424)

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 08:50:05 +0000 (01:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2c47595d891804dd376dd6b14764d20d61891b01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoLogging improvements when NetworkCapabilities change
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change

This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Change-Id: I05c6e78891e1eac658f1cf883223af520a9a4f8f

7 years agoReport permission flags for all protections based on SDK
Svetoslav Ganov [Fri, 28 Jul 2017 05:46:53 +0000 (05:46 +0000)]
Report permission flags for all protections based on SDK

We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.

Test: All permission tests pass
      Added a new test to ensure no protection flags reported
      for normal and dangerous permissions

Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513
bug:62755026

7 years agoRevert "Report permission flags for all protections based on SDK"
Bart Sears [Fri, 28 Jul 2017 05:17:52 +0000 (05:17 +0000)]
Revert "Report permission flags for all protections based on SDK"
am: 784b56e1e6

Change-Id: Ice7dde53c5613f48d013424a7e99203fd854e532

7 years agoRevert "Report permission flags for all protections based on SDK"
Bart Sears [Fri, 28 Jul 2017 05:05:38 +0000 (05:05 +0000)]
Revert "Report permission flags for all protections based on SDK"

This reverts commit 852cf98cb8a4b9b56da84a96708c087996e119d2.

Change-Id: I62763bf85ec95a02a245c6b503aa34bb0e9d997a

7 years agoMerge "NetworkNotificationManager: correctly handle existing notifications" into...
Hugo Benichi [Fri, 28 Jul 2017 04:27:16 +0000 (04:27 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev

7 years agoForce update wifi QS when opening.
Sundeep Ghuman [Thu, 27 Jul 2017 03:23:32 +0000 (20:23 -0700)]
Force update wifi QS when opening.

This changes expands on ag/2608526 by forcing a refresh of AccessPoints
when the QuickSettings picker is opened. This consolidates logic between
QS and Settings, where in WifiSettings we forceUpdate on cold start.

Bug: b/62680006
Test: 1. Open the quick settings picker
2. Minimize the picker
3. Walk out of range of the networks you say listed in the picker
4. Re-open picker
5. Stale networks should not be shown, latest scan results should be.

Change-Id: Ia944dd3dbeff7d9c3774f04129c07f1ffd4466b2

7 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
Hugo Benichi [Thu, 6 Apr 2017 08:22:18 +0000 (17:22 +0900)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler

This patch moves reportNetworkConnectivity onto the handler of
ConnectivityService.

This allows:
  - to inspect NetworkAgentInfo on the ConnectivityService handler,
    which is always more correct than doing so on a Binder thread.
  - to improve locking policies around NetworkAgentInfo.

Test: $ runtest frameworks-net
Bug: 3711961936902662
Change-Id: I49a765826e65c29a1995242290e5e7544112c94e

7 years agoDO NOT MERGE ANYWHERE ConnectivityService: safer locking
Hugo Benichi [Thu, 6 Apr 2017 07:01:44 +0000 (16:01 +0900)]
DO NOT MERGE ANYWHERE ConnectivityService: safer locking

This path changes a dangerous lock path in reportNetworkConnectivity().
This methods is called outside of the main ConnectivityService handler
and takes a lock on a specific NetworkAgentInfo whose connectivity
status is being reported.

While this lock is held, reportNetworkConnectivity() goes on and query
the network policy state for that network, which may ends into
NetworkPolicyManagerService.

Instead, the lock on NetworkAgentInfo is only held long enough to make a
copy of LinkProperties, which is then passed to
NetworkPolicyManagerService without that lock.

Bug: 36902662
Test: could not repro b/36902662, reportNetworkConnectivity() works.
      $ runtest frameworks-net

Change-Id: Iac4b75bcecbdddb0ac695c8b1a87ae755f62f47f

7 years agoReport permission flags for all protections based on SDK
Svetoslav Ganov [Fri, 28 Jul 2017 02:49:30 +0000 (02:49 +0000)]
Report permission flags for all protections based on SDK
am: 852cf98cb8

Change-Id: I6e87c8f40fa466f2a50f41549be41ea4fb598824

7 years agoMerge "wifi: Modify the SAR power levels interface" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 02:47:04 +0000 (02:47 +0000)]
Merge "wifi: Modify the SAR power levels interface" into oc-dr1-dev