OSDN Git Service
Narayan Kamath [Tue, 1 Aug 2017 11:38:45 +0000 (11:38 +0000)]
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
Narayan Kamath [Mon, 31 Jul 2017 10:10:50 +0000 (11:10 +0100)]
PrintManagerService: Don't prune services on all package change events.
We should only need to prune services if the package that changed
had a print service or has been changed to have a print service.
Bug:
63019430
Test: Manual; observed that the print spooler isn't started up.
Test: run cts -m CtsPrintTestCases
Change-Id: I32df27e4b1d11615cf6053dd3d35c2b60068d0d3
Neil Fuller [Tue, 1 Aug 2017 10:06:16 +0000 (10:06 +0000)]
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 09:11:18 +0000 (09:11 +0000)]
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 08:05:33 +0000 (08:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 07:58:07 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 07:41:04 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7eca0300b9 -s ours
Change-Id: I28041089f69930af33b4ab93d031a2c2efceb0ab
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:11:02 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am:
dbd60cd6ee
Change-Id: I5b6ff8bb9913fb43386c51fd47ae5e80e76541f2
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
TreeHugger Robot [Tue, 1 Aug 2017 05:17:52 +0000 (05:17 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 03:47:09 +0000 (03:47 +0000)]
Merge "power: gps: add gps read timeout" into oc-mr1-dev
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
35362108
Bug:
37013369
Bug:
62044295
Bug:
63826516
Merged-In: Iaad13e13976e9bf8f508d7188f823f8184ac414b
(cherry pick from commit
ff3e6ccca1715ae72c6499cc7c894d27f46e8403)
Change-Id: I5e6a1ecc6b98069ef0089bbceecf73f7692df227
TreeHugger Robot [Tue, 1 Aug 2017 02:21:21 +0000 (02:21 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
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
TreeHugger Robot [Tue, 1 Aug 2017 02:02:47 +0000 (02:02 +0000)]
Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
Tyler Freeman [Tue, 1 Aug 2017 01:54:27 +0000 (01:54 +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
am:
1831989a6e -s ours
Change-Id: Ib7948e307bfd18f54fc84fab6f1fc3d876cc9351
TreeHugger Robot [Tue, 1 Aug 2017 01:50:06 +0000 (01:50 +0000)]
Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 01:42:03 +0000 (18:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I913c1e958acf25433ad56dd3d6caa97441b8754a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
Jeff Sharkey [Tue, 1 Aug 2017 01:38:09 +0000 (01:38 +0000)]
Merge "Update inferred policies from SubscriptionPlan." into oc-mr1-dev
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
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
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
TreeHugger Robot [Tue, 1 Aug 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 00:41:28 +0000 (00:41 +0000)]
Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd
Meng Wang [Tue, 1 Aug 2017 00:36:56 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: Id6679935220de109c9d891431696fc3354a021fd
TreeHugger Robot [Tue, 1 Aug 2017 00:36:49 +0000 (00:36 +0000)]
Merge "List column names in the error message" into oc-mr1-dev
Meng Wang [Tue, 1 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: I305e747d63fcefd02323058831064fc39c7a2ebb
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
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
Dianne Hackborn [Tue, 1 Aug 2017 00:02:51 +0000 (17:02 -0700)]
Add documentation on oneway transaction ordering.
Test: built
Change-Id: I4d2e336327a4ce9c8f76d49037c894e981bdf571
Fyodor Kupolov [Mon, 31 Jul 2017 23:56:02 +0000 (23:56 +0000)]
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
Christopher Tate [Wed, 26 Jul 2017 21:27:38 +0000 (14:27 -0700)]
Persisted jobs versus incorrect boot-time RTC
Devices routinely boot in a state where the RTC is wildly incorrect
in the past (2009, 1999, or even at Unix epoch zero). When we have
persistent jobs to be scheduled at boot, this presents a problem: when
should those jobs run, given that our idea of "now" is incorrect?
The previous implementation fell back to rescheduling these jobs
"from scratch" in this situation, as though they were newly-introduced,
but this turns out to have some emergent pathologies when the jobs
were intended to become runnable after long initial delays: the
rescheduling behavior could wind up starving jobs out entirely,
never running them regardless of how much real uptime the device
had, given the "wrong" pattern of reboots.
We now preserve the original nominal schedule, but recognize when we
have booted in a pathological situation, and correct the schedule for
these jobs when the system clock becomes sensible.
Bug
63817592
Test: JobScheduler test suite plus manual bogus-boot-time repro
Change-Id: Ia36fc5298b68db74e4e07e973b68e68e66206b43
Jeff Sharkey [Sun, 30 Jul 2017 22:52:51 +0000 (16:52 -0600)]
Update inferred policies from SubscriptionPlan.
When creating or updating inferred network policies, consult any
SubscriptionPlan information first, then fallback to CarrierService
values, before finally falling back to system defaults.
Dump known SubscriptionPlan values in dumpsys output for debugging.
Fix bug where updateNetworkRulesNL() tried calculating cycles when
non existed.
Test: builds, boots, subscription plans update
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
63925474,
64124815
Change-Id: I12257cada14f72890d5346e366643aac88de278e
Eric Schwarzenbach [Tue, 25 Jul 2017 21:32:21 +0000 (14:32 -0700)]
Add individual ScanResult speeds to verbose logging.
Moves the individual ScanResult summary string generation out of
getVisibilityStatus into its own method `verboseScanResultSummary`,
to reduce duplication and to enable testing the per-ScanResult speed labeling.
Bug:
63866500
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I9583d142a7d50314017154703df4e1ce69fc68aa
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
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: Iedafc28d1a63b708b1992e4ef3570069c59d087a
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
Adam Lesinski [Mon, 31 Jul 2017 22:17:27 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I6878ca92b2bd8b2e9569147dde007ae657adc87c
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
Alex Sakhartchouk [Mon, 31 Jul 2017 21:48:28 +0000 (21:48 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am:
34b2389fcf
Change-Id: I90669fbeed47a0f75e4f113a155cd54ab681a3c8
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
Bill Yi [Mon, 31 Jul 2017 21:28:47 +0000 (14:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I291a116779321dcb61aed83ce853a5fc0214084e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
Michal Karpinski [Mon, 31 Jul 2017 19:03:13 +0000 (19:03 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
TreeHugger Robot [Mon, 31 Jul 2017 18:59:52 +0000 (18:59 +0000)]
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-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
Bryce Lee [Mon, 31 Jul 2017 18:50:32 +0000 (18:50 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc6ea27ae4e813e3430ea75c8c26057f6bec2304
Bryce Lee [Mon, 31 Jul 2017 18:45:19 +0000 (18:45 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: Id6748aab9ee83844303324ea397d4ac699fb5839
Bryce Lee [Mon, 31 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
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
TreeHugger Robot [Mon, 31 Jul 2017 18:23:04 +0000 (18:23 +0000)]
Merge "Stop font loading with restricted context." into oc-mr1-dev
Fyodor Kupolov [Tue, 25 Jul 2017 21:17:33 +0000 (14:17 -0700)]
Added setIdleConnectionTimeout method
It allows apps to set time SQLite connection is allowed to be idle
before it is closed and removed from the pool.
Test: manual + DatabaseGeneralTest
Bug:
63398887
Change-Id: Ie09eeb4dc2b9e52ba67d9355b1f9bd869b148613
TreeHugger Robot [Mon, 31 Jul 2017 17:52:41 +0000 (17:52 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Neil Fuller [Fri, 28 Jul 2017 13:31:57 +0000 (14:31 +0100)]
Add a new constant to TimeZoneRulesDataContract
This enables time zone data app code (provided by Google)
to check the manifest (provided by the OEM) uses the right permission
without referencing internal manifest permission Strings directly.
Bug:
64139059
Test: Ran internal xTS tests
Change-Id: I4b1a8608beff3b5218ecf5162cfe8e31027e2007
(cherry picked from commit
8e2a85752b9b45e3294c5e94a6a882329433054f)
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
Adrian Roos [Mon, 31 Jul 2017 16:48:34 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: Ibd62f5942fd09e0c1ec846db0595c76d0ad822be
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
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
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
Selim Gurun [Mon, 31 Jul 2017 14:27:52 +0000 (14:27 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
Neil Fuller [Fri, 28 Jul 2017 16:16:11 +0000 (17:16 +0100)]
Fix tracing call for RulesManagerService startup
The tracing call was correct for aosp/master, but the tracing
code had been changed internally. The incorrect call meant it
wasn't actually tracking the points we're interested in and
it was reporting incorrectly (by ~1000 millis).
Bug:
64141572
Test: boot device / adb logcat
Change-Id: If11354d1d73cf90973ed4f43e885ae28ca1346ea
(cherry picked from commit
a87cd5daa0bee1ed045e726194fca2deab6d88c5)
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.
Adrian Roos [Mon, 31 Jul 2017 12:36:20 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: I94e9f30fa3f56b56c140f834674d38b776c8ed21
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
TreeHugger Robot [Mon, 31 Jul 2017 07:08:08 +0000 (07:08 +0000)]
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
Bill Yi [Mon, 31 Jul 2017 06:06:13 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
273bb516ad -s ours
Change-Id: Id0870731ec3a6b1e10a413bcd0f1e74178a55271
TreeHugger Robot [Mon, 31 Jul 2017 06:00:50 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Mon, 31 Jul 2017 03:54:08 +0000 (20:54 -0700)]
Remove a compat hack SurfaceView#setWindowType()
This CL logically reverts a compatibility hack I introduced [1] for
apps that had relied on @hide method SurfaceView#setWindowType(int).
[1]: I5217f6417a73690ae8a978754218b7b089070fdd
3b5011afc9e17963607269bfb6665d04e3ab4ca1
Fixes:
62054282
Test: Manually verified that Bug
36345857 is still not reproducible
Change-Id: Icee198c554de558cfa4ffe0b264064969839654e
pkanwar [Fri, 28 Jul 2017 18:10:55 +0000 (11:10 -0700)]
Add string needed to support carrier wifi in UI.
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.
Bug:
30988281
Test: manual
Change-Id: I41e63ce831dface4f2baf2879dde84ebe2fecc94
TreeHugger Robot [Sun, 30 Jul 2017 00:18:21 +0000 (00:18 +0000)]
Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev
TreeHugger Robot [Sun, 30 Jul 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
TreeHugger Robot [Sun, 30 Jul 2017 00:05:07 +0000 (00:05 +0000)]
Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev
Lucas Dupin [Sat, 29 Jul 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am:
f98facc3b8
Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
TreeHugger Robot [Sat, 29 Jul 2017 23:08:04 +0000 (23:08 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
Lucas Dupin [Sat, 29 Jul 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am:
011ac1bb7c
Change-Id: I2c1685e78a2de37192eceff40d254546b37d7d5e
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
Vinay Kalia [Sat, 29 Jul 2017 22:17:03 +0000 (22:17 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
am:
604a4b7171
Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2
TreeHugger Robot [Sat, 29 Jul 2017 22:08:36 +0000 (22:08 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
Jeff Sharkey [Sat, 29 Jul 2017 16:11:35 +0000 (16:11 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d
am:
ea99954804
Change-Id: If4d45586afd4dde05a3aad10d25f73afdcc3e92d
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
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev
Sundeep Ghuman [Sat, 29 Jul 2017 09:17:12 +0000 (09:17 +0000)]
Merge "Force update wifi QS when opening." into oc-dr1-dev
am:
0e9d9420e3
Change-Id: I806437c5034cb8a83e92e0b6e2477619c480e891
TreeHugger Robot [Sat, 29 Jul 2017 09:10:12 +0000 (09:10 +0000)]
Merge "Force update wifi QS when opening." into oc-dr1-dev
Wei Wang [Sat, 29 Jul 2017 03:07:39 +0000 (03:07 +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
am:
a473117706 -s ours
Change-Id: Ifbac13ab2fc5b4cddf8087d121c1894144f6a4c3
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
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
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
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)
Hugo Benichi [Fri, 28 Jul 2017 23:54:03 +0000 (23:54 +0000)]
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am:
6e269ec6fe
Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Hugo Benichi [Fri, 28 Jul 2017 23:42:59 +0000 (23:42 +0000)]
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
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
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
Bill Yi [Fri, 28 Jul 2017 23:20:55 +0000 (23:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
869a72294d -s ours
Change-Id: Ib32b6e81aaa755736ea9ac810b6349c6a750ac3a
Bill Yi [Fri, 28 Jul 2017 23:10:01 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 28 Jul 2017 23:09:15 +0000 (23:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
Jeff Sharkey [Fri, 28 Jul 2017 22:55:41 +0000 (16:55 -0600)]
Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead. Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.
Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.
Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier. Also fix
NPE when SubscriptionInfo is missing.
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
63997177,
63928277,
64156138,
63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4