OSDN Git Service
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: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
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
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
Selim Gurun [Mon, 31 Jul 2017 14:27:52 +0000 (14:27 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
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
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
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
Bill Yi [Fri, 28 Jul 2017 22:38:28 +0000 (15:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f315dce0218d99e7677cccfe88b5b5caeb80f70
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Makoto Onuki [Thu, 27 Jul 2017 22:56:40 +0000 (15:56 -0700)]
Reduce duplicate strings due to the package cache.
The following charts are the actual measurement with and without the fix,
using "dumpsys system".
- The red bar is "total private dirty".
- The X axsis is time since boot.
Without fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=0
Private dirty stabilizes at ~16.8M.
- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=
1918404197
Private dirty stabilizes at ~17.8M.
With fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=
791764875
Private dirty stabilizes at ~17.0M.
- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=
1820894299
Private dirty stabilizes at ~17.0M.
Test: build, boot, reboot, adb-install, reboot
bit FrameworksCoreTests:android.content.pm.PackageParserTest
Bug:
64112468
Change-Id: I5ae9c1b2d021fe62526d4e0dd1a52a962b48206e
Sergey Vasilinets [Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)]
Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev
am:
2cf8f91637
Change-Id: Ia0f4dc6193776e0b37eb7e2d2048918510cae535
Svet Ganov [Fri, 28 Jul 2017 21:55:11 +0000 (21:55 +0000)]
Handle case for missing permissions - fix NPE am:
39cc33f192
am:
6e527d0ec5
Change-Id: I1ac6a0714fe2b466e313c337183097640deb4d58
Andrew Solovay [Fri, 28 Jul 2017 21:50:15 +0000 (21:50 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am:
04d43a6a7b
am:
51f65bbcbf
Change-Id: I17386cc10e591e60442eeeba7e4dec42c9b4bd54
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
Michael Wright [Fri, 28 Jul 2017 21:46:02 +0000 (21:46 +0000)]
Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev
am:
c541380f91 -s ours
Change-Id: I8e51e3e0aa2dfead04316af6d7404a34c7cb0b9b
Michael Wright [Fri, 28 Jul 2017 21:36:14 +0000 (21:36 +0000)]
Add new config to tell us whether brightness is bucketed or continuous
am:
65d3e7059d -s ours
Change-Id: I3fc36fc193aa9704f2173c67e58b6827a8ee8884
Bryce Lee [Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
am:
5b76ce1b2b
Change-Id: Ibf899e9a08cdab31ae38897add813fc4c8089474
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
Evan Laird [Fri, 28 Jul 2017 21:22:28 +0000 (21:22 +0000)]
Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev
am:
905fcf0787
Change-Id: I71cbb691f3bfe8d4d37fd09d5d1bc5ef83146090
Benjamin Miller [Fri, 28 Jul 2017 21:15:41 +0000 (21:15 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am:
91f16ace4f
am:
5934ae605a
Change-Id: Ia4c07afe64fd3a0a743790f1e1284bdc1db0f4c5
Jason Monk [Fri, 28 Jul 2017 21:00:21 +0000 (17:00 -0400)]
resolve merge conflicts of
6683cc6a83a8 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I20bec8ef750b6ef8627d69baa60ee4e4218cc596
Jason Monk [Fri, 28 Jul 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev
am:
ac73492ca5
Change-Id: I8ce276208b39618d7ff2c46a5cca5a2356633d6f
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
Jason Monk [Fri, 28 Jul 2017 20:24:07 +0000 (20:24 +0000)]
Merge "resolve merge conflicts of
148db9dfa669 to oc-mr1-dev" into oc-mr1-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
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
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
Selim Gurun [Fri, 28 Jul 2017 17:33:58 +0000 (10:33 -0700)]
Update documentation for Whitelist API
Bug:
64144913
Test: compile documentation and visually confirm
Change-Id: Ia19ca9b6cf4f8a0802835d597a30e10c498dbd81
Bill Yi [Fri, 28 Jul 2017 18:42:31 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id4fce6fcdfd8f1da7d1b8d119180aa59312e432b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
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
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
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
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
Jason Monk [Fri, 28 Jul 2017 17:29:01 +0000 (13:29 -0400)]
resolve merge conflicts of
148db9dfa669 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idc9270dda8225d8e36204a2bc4fd41c7b864ca1a
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
TreeHugger Robot [Fri, 28 Jul 2017 17:23:21 +0000 (17:23 +0000)]
Merge "Allow the launcher to get all instant apps" into oc-mr1-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
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
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
Android Build Merger (Role) [Fri, 28 Jul 2017 17:03:00 +0000 (17:03 +0000)]
Merge "Report permission flags for all protections based on SDK am:
adb8c522a8 am:
436b901dbb" into oc-mr1-dev
Jason Monk [Fri, 28 Jul 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Fix recents split-screen icon" into oc-dr1-dev
Andrew Solovay [Fri, 28 Jul 2017 17:00:34 +0000 (17:00 +0000)]
Merge "Cherry-pick from master: AAPT2: Fix JavaDoc first sentence extraction." into oc-mr1-dev
Svetoslav Ganov [Fri, 28 Jul 2017 16:59:55 +0000 (16:59 +0000)]
Report permission flags for all protections based on SDK am:
adb8c522a8
am:
436b901dbb
Change-Id: Ibe7cecd60242f1895434d586af30c2081d451f0b
Mathieu Chartier [Fri, 28 Jul 2017 16:50:23 +0000 (16:50 +0000)]
Merge "Add AsyncTask to compiled classes" into oc-dr1-dev
am:
19b979ca85
Change-Id: Id8efcf64451df4ab5d8636207434a21c34334b77
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
TreeHugger Robot [Fri, 28 Jul 2017 16:36:46 +0000 (16:36 +0000)]
Merge changes Iab5fae74,I3d5076ca into oc-mr1-dev
* changes:
Tidy up RulesManagerService code
Remove TODO related to WakeLocks
Mathieu Chartier [Fri, 28 Jul 2017 16:33:18 +0000 (16:33 +0000)]
Merge "Add AsyncTask to compiled classes" into oc-dr1-dev
Jason Monk [Fri, 28 Jul 2017 16:26:45 +0000 (16:26 +0000)]
Merge "QS Tweaks" into oc-dr1-dev
am:
48db7e6dcd
Change-Id: I0450c4ad8e517a642cf7fea7d9302874e3229e57
Bill Yi [Fri, 28 Jul 2017 16:25:14 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
31816f7464 -s ours
Change-Id: I8ed6ff2f40eebe612cf866c66867dc6adfbc0126
Adrian Roos [Fri, 28 Jul 2017 16:23:17 +0000 (16:23 +0000)]
Merge "AOD: Fix more flickering" into oc-dr1-dev
am:
f2c8a24f56
Change-Id: I8027fe0d4050ca906c4e8973e9c5a9ad0ffa802c
Wale Ogunwale [Fri, 28 Jul 2017 16:21:33 +0000 (16:21 +0000)]
Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
am:
932bc6dffc
Change-Id: Icee06050d8000ada0ed7973a7befb90a1273238b
Adrian Roos [Fri, 28 Jul 2017 16:15:29 +0000 (16:15 +0000)]
Merge "resolve merge conflicts of
19d8e4e04e6c to oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 16:12:14 +0000 (16:12 +0000)]
Merge "wifi: ScanResult: add carrier network indicator" into oc-mr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 16:00:10 +0000 (16:00 +0000)]
Merge "QS Tweaks" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 15:26:54 +0000 (15:26 +0000)]
Merge "Revert "Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev"" into oc-mr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 15:24:59 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 15:16:38 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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
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
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
TreeHugger Robot [Fri, 28 Jul 2017 14:40:45 +0000 (14:40 +0000)]
Merge "AOD: Fix more flickering" into oc-dr1-dev
Todd Kennedy [Fri, 28 Jul 2017 14:31:51 +0000 (07:31 -0700)]
Allow the launcher to get all instant apps
Change-Id: Ie0381d01fe8cd5293a0a3671c1bdf497ca5c5783
Fixes:
63814920
Test: Manual
Test: Make and install a launcher that calls the protected APIs
Test: Run launcher, see that it gets a security exception
Test: Make the launcher the default, see that it gets a security exception
Test: Install the launcher as a system app
Test: Run the launcher, see that it gets a security exception
Test: Make the launcher the default, see that the API works
OSDN Git Service
