OSDN Git Service
Hugo Benichi [Fri, 14 Apr 2017 15:36:10 +0000 (15:36 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2 am:
4d80366762
am:
e505b37ec5
Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
Hugo Benichi [Fri, 14 Apr 2017 15:29:09 +0000 (15:29 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2
am:
4d80366762
Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
Seigo Nonaka [Fri, 14 Apr 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
am:
43112fd26e
Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89
Hugo Benichi [Fri, 14 Apr 2017 15:22:39 +0000 (15:22 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
am:
1a8f04b1b2
Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
Seigo Nonaka [Fri, 14 Apr 2017 15:13:12 +0000 (15:13 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
- callback recycling: releasing then reregistering a callback again.
- multiple request registrations with the same callback.
The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.
In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
- request to callback unmapping is done synchronously at callback
release time.
- all requests associated to a callback are unmapped at callback
release time.
This fixes the following issues:
- a callback stops being triggered as soon as it is released.
Otherwise when recycling the callback immediately, it is possible
the previous request associated with it triggers it, confusing the
app.
- when a callback is registered multiple times, the requests are not
leaked.
- when a callback is registered multiple times and then released, the
N-1 first registrations do not trigger the callback anymore.
In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.
Bug:
35921499,
35955593,
20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
recycling, and a disabled test for no multiple regristration.
- new tests catch regression causing b/
35921499, b/
35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
Hugo Benichi [Fri, 14 Apr 2017 12:34:33 +0000 (12:34 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev
am:
a622b24d3a -s ours
Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122
Hugo Benichi [Fri, 14 Apr 2017 12:28:37 +0000 (12:28 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev
Jorim Jaggi [Fri, 14 Apr 2017 12:02:08 +0000 (12:02 +0000)]
Merge "Implement new splash screen API" into oc-dev
am:
46ae660bf2
Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8
TreeHugger Robot [Fri, 14 Apr 2017 11:54:38 +0000 (11:54 +0000)]
Merge "Implement new splash screen API" into oc-dev
Andrew Scull [Fri, 14 Apr 2017 11:43:03 +0000 (11:43 +0000)]
Merge "Service for OEM lock management." into oc-dev
am:
e52a1bfede
Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
Andrew Scull [Fri, 14 Apr 2017 11:31:00 +0000 (11:31 +0000)]
Merge "Service for OEM lock management." into oc-dev
Svet Ganov [Fri, 14 Apr 2017 10:01:13 +0000 (10:01 +0000)]
Add back an id used by CTS
am:
3de36a3cc1
Change-Id: I4c7ad8ad12f555cf6244092498da471043dbdb9f
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578
(cherry picked from commit
eef918a66c984ac7bb1f541665f4dc9bb88ea7ac)
Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
Svet Ganov [Fri, 14 Apr 2017 07:17:12 +0000 (00:17 -0700)]
Add back an id used by CTS
Test: tests can find the autofill dropdown
Change-Id: I4361960b4a12e02b06cca1e3112e4679cd6e484d
Casey Burkhardt [Fri, 14 Apr 2017 07:48:19 +0000 (07:48 +0000)]
Merge "Icon assets for magnification" into oc-dev
am:
4d386d5ce7
Change-Id: I2d75a1bdbaff4ec53b7c7a903374932e092de2cf
Jakub Pawlowski [Fri, 14 Apr 2017 07:47:10 +0000 (07:47 +0000)]
Bluetooth 5 PHY simplification
am:
a51513747a
Change-Id: I01dc8b494069bb8a1c19ac6ba8aefb5029b991b3
TreeHugger Robot [Fri, 14 Apr 2017 07:41:37 +0000 (07:41 +0000)]
Merge "Icon assets for magnification" into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 15:51:22 +0000 (08:51 -0700)]
Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.
This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.
Bug:
30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit
9e377194e35c0fb9ac5771f5658c095ed97e0838)
Hugo Benichi [Fri, 14 Apr 2017 07:07:46 +0000 (07:07 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd am:
605eafe0a5
am:
4479901ff3
Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
Hugo Benichi [Fri, 14 Apr 2017 07:00:41 +0000 (07:00 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd
am:
605eafe0a5
Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
Hugo Benichi [Fri, 14 Apr 2017 06:54:10 +0000 (06:54 +0000)]
Merge "Captive portal: rotate fallback urls"
am:
76b3537dfd
Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
Treehugger Robot [Fri, 14 Apr 2017 06:41:07 +0000 (06:41 +0000)]
Merge "Captive portal: rotate fallback urls"
Jorim Jaggi [Fri, 14 Apr 2017 05:34:38 +0000 (05:34 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev
am:
9d2f03ec5d
Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c
TreeHugger Robot [Fri, 14 Apr 2017 05:24:41 +0000 (05:24 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev
Winson Chung [Fri, 14 Apr 2017 05:22:04 +0000 (05:22 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev
am:
2e86be7653
Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
Romain Guy [Fri, 14 Apr 2017 05:20:55 +0000 (05:20 +0000)]
Merge "Fix javadoc typos" into oc-dev
am:
4b6e82d237
Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
Andrii Kulian [Fri, 14 Apr 2017 05:17:33 +0000 (05:17 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
am:
c66b6ff997
Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
Winson Chung [Fri, 14 Apr 2017 05:12:50 +0000 (05:12 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Fix javadoc typos" into oc-dev
Andrii Kulian [Fri, 14 Apr 2017 05:05:19 +0000 (05:05 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
Jesse Evans [Fri, 14 Apr 2017 04:56:33 +0000 (04:56 +0000)]
Merge "Fix instant app filtering in ApplicationsState" into oc-dev
am:
9bdaa9c9fa
Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
Winson Chung [Fri, 14 Apr 2017 04:50:03 +0000 (04:50 +0000)]
Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev
am:
4191d99614
Change-Id: I257467c0f950af3a1b27bbff21e466323babe513
TreeHugger Robot [Fri, 14 Apr 2017 04:49:39 +0000 (04:49 +0000)]
Merge "Fix instant app filtering in ApplicationsState" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 04:38:55 +0000 (04:38 +0000)]
Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev
* changes:
Fixing missing movement bounds notification to SystemUI.
Fixing animating bounds regression.
Tightening up rotation behavior for PIP (2/3)
Tightening up rotation behavior for PIP (1/3)
Svet Ganov [Fri, 14 Apr 2017 04:36:40 +0000 (04:36 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev
am:
249c4d709a
Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55
Android Build Merger (Role) [Fri, 14 Apr 2017 04:34:21 +0000 (04:34 +0000)]
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am:
2a30085e5c" into oc-dev-plus-aosp
Dmitry Dementyev [Fri, 14 Apr 2017 04:33:27 +0000 (04:33 +0000)]
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
am:
2a30085e5c
Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
Android Build Merger (Role) [Fri, 14 Apr 2017 04:33:02 +0000 (04:33 +0000)]
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am:
0e8090b10e" into oc-dev-plus-aosp
Hugo Benichi [Fri, 14 Apr 2017 04:32:17 +0000 (04:32 +0000)]
Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
am:
0e8090b10e
Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
Android Build Merger (Role) [Fri, 14 Apr 2017 04:31:44 +0000 (04:31 +0000)]
Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am:
f5d5e5e4bf" into oc-dev-plus-aosp
Jeff Sharkey [Fri, 14 Apr 2017 04:30:50 +0000 (04:30 +0000)]
Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev
am:
f5d5e5e4bf
Change-Id: I2af664620bdaf6fa4551aade80e56decf0995838
Android Build Merger (Role) [Fri, 14 Apr 2017 04:30:25 +0000 (04:30 +0000)]
Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am:
4cae059bb9" into oc-dev-plus-aosp
Romain Guy [Fri, 14 Apr 2017 04:29:39 +0000 (04:29 +0000)]
Merge "Add more doc to ColorSpace.getName()" into oc-dev
am:
4cae059bb9
Change-Id: If6674f4884a8d0e4c36072125cbcc7895a49abe5
Android Build Merger (Role) [Fri, 14 Apr 2017 04:29:17 +0000 (04:29 +0000)]
Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am:
59047acea7" into oc-dev-plus-aosp
Christopher Tate [Fri, 14 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "Turn down dynamic toggle for background restriction policy" into oc-dev
am:
59047acea7
Change-Id: Ibd345b735d1743f2c253bc0d0937a44573343dd0
Android Build Merger (Role) [Fri, 14 Apr 2017 04:28:07 +0000 (04:28 +0000)]
Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am:
59c124b755" into oc-dev-plus-aosp
Mady Mellor [Fri, 14 Apr 2017 04:27:08 +0000 (04:27 +0000)]
Merge "Visual changes to PIP drag to dismiss UI" into oc-dev
am:
59c124b755
Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
Android Build Merger (Role) [Fri, 14 Apr 2017 04:26:44 +0000 (04:26 +0000)]
Merge "Check for non-null parent before delegating to it am:
3a74243ae4" into oc-dev-plus-aosp
Svet Ganov [Fri, 14 Apr 2017 04:26:02 +0000 (04:26 +0000)]
Check for non-null parent before delegating to it
am:
3a74243ae4
Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
Rebecca Silberstein [Fri, 14 Apr 2017 04:25:57 +0000 (04:25 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4 am:
6fc5051613
am:
2f7a169618
Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
TreeHugger Robot [Fri, 14 Apr 2017 04:22:06 +0000 (04:22 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev
Rebecca Silberstein [Fri, 14 Apr 2017 04:19:02 +0000 (04:19 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4
am:
6fc5051613
Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
Andreas Huber [Fri, 14 Apr 2017 04:17:37 +0000 (04:17 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am:
9b2ed2b7c4
Change-Id: Ibc670da31571add92a312b7673be376be67f9072
Roozbeh Pournader [Fri, 14 Apr 2017 04:14:25 +0000 (04:14 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev
am:
1ad7ff32b1
Change-Id: Ic5244c47a1d31e75df484decc65195fd381bf8b5
Yifan Hong [Fri, 14 Apr 2017 04:13:04 +0000 (04:13 +0000)]
Merge "Add Java API for libvintf." into oc-dev
am:
c223d70e64
Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
Rebecca Silberstein [Fri, 14 Apr 2017 04:12:34 +0000 (04:12 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
am:
e98a2942a4
Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
Ta-wei Yen [Fri, 14 Apr 2017 04:11:29 +0000 (04:11 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
am:
ad989b1711
Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
Rebecca Silberstein [Fri, 14 Apr 2017 04:03:48 +0000 (04:03 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
TreeHugger Robot [Fri, 14 Apr 2017 03:53:48 +0000 (03:53 +0000)]
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
Casey Burkhardt [Fri, 14 Apr 2017 03:52:11 +0000 (20:52 -0700)]
Icon assets for magnification
Adds updated assets for the magnification icon to
AccessibilityButtonChooserActivity.
Bug:
37295643
Test: Manual - verified icon appearance in chooser
Change-Id: I1ddfb01889c86b481b2df0f924be6c0dc8daae04
TreeHugger Robot [Fri, 14 Apr 2017 03:42:56 +0000 (03:42 +0000)]
Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
* changes:
Connectivity metrics: add transports to connect stats
Connectivity metrics: log DnsEvents in-band
TreeHugger Robot [Fri, 14 Apr 2017 03:37:33 +0000 (03:37 +0000)]
Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 03:10:12 +0000 (03:10 +0000)]
Merge "Add more doc to ColorSpace.getName()" into oc-dev
Romain Guy [Fri, 14 Apr 2017 03:06:41 +0000 (20:06 -0700)]
Fix javadoc typos
Bug:
37328228
Test: compiles
Change-Id: I75323ef5afb30381aa473ebe7172ebb145eac8f3
TreeHugger Robot [Fri, 14 Apr 2017 03:00:19 +0000 (03:00 +0000)]
Merge "Turn down dynamic toggle for background restriction policy" into oc-dev
Jesse Evans [Thu, 13 Apr 2017 01:06:50 +0000 (18:06 -0700)]
Fix instant app filtering in ApplicationsState
This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).
Test: Added tests for the filter
runtest -x packages/SettingsLib/tests/integ
Bug:
37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
Jorim Jaggi [Thu, 23 Feb 2017 14:35:51 +0000 (15:35 +0100)]
Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests
Bug:
37252694
Change-Id: Ie2aec4764d958086897296ed0fc3c39c55c4d8aa
Merged-In: I9a5bc19b8f63312e682e536500411e4ff4639f88
TreeHugger Robot [Fri, 14 Apr 2017 02:39:56 +0000 (02:39 +0000)]
Merge "Visual changes to PIP drag to dismiss UI" into oc-dev
Lorenzo Colitti [Fri, 14 Apr 2017 02:37:12 +0000 (11:37 +0900)]
resolve merge conflicts of
4db137b0599a to oc-dev-plus-aosp
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
Svet Ganov [Thu, 13 Apr 2017 23:03:34 +0000 (16:03 -0700)]
Check for non-null parent before delegating to it
Test: manual
bug:
37289681
Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
Winson Chung [Wed, 12 Apr 2017 01:31:21 +0000 (18:31 -0700)]
Fixing missing movement bounds notification to SystemUI.
- When WM updates from a configuration change, ensure that we update the
pinned stack controller even if there is currently no pinned stack.
- Also finish the menu activity once an activity is unpinned.
Bug:
36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I789945c1783693cf4b4e3d6663548c8669784001
TreeHugger Robot [Fri, 14 Apr 2017 02:13:21 +0000 (02:13 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:04:31 +0000 (02:04 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:02:01 +0000 (02:02 +0000)]
Merge "Add Java API for libvintf." into oc-dev
Jeff Sharkey [Fri, 14 Apr 2017 01:43:34 +0000 (19:43 -0600)]
Relax enforcement of GET_USAGE_STATS permission.
This matches the logic used in all other places where we check for
this app-op.
Test: builds, boots
Bug:
37315351
Change-Id: I1fef7d30709d24c3f8978d33271a15b37b2ccc26
Hugo Benichi [Thu, 23 Mar 2017 09:38:22 +0000 (18:38 +0900)]
Connectivity metrics: add transports to connect stats
This patch groups connect() events per netId. It adds netid and
transport information to serialized ConnectStatistics events.
Test: updated NetdEventListenerServiceTest
updated IpConnectivityMetricsTest
$ runtest frameworks-net passes
Bug:
34901696
Change-Id: Id0d536ff723ded5c26eafe0bb138ba75ba2856c5
Merged-In: I4769496383943e714a1d350c298e093c2ed57477
(cherry picked from commit
dfc2cc5857199345e08f07977b79b20292f964a2)
TreeHugger Robot [Fri, 14 Apr 2017 01:44:01 +0000 (01:44 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
Hugo Benichi [Wed, 22 Mar 2017 13:21:44 +0000 (22:21 +0900)]
Connectivity metrics: log DnsEvents in-band
This patch changes how DnsEvents are logged in IpConnectivityMetrics.
The following changes are made:
- DnsEventBatch are not logged after 100 queries on the same network
- this allows to merge DnsEvent and DnsEventBatch into one class
- DnsEventBatch are not logged after a network disconnect
- this allows to remove the NetworkCallback
- DnsEvent are now logged similarly to ConnectStats when statistics are
flushed, in a direct call from IpConnectivityMetrics into
NetdEventListenerService, in a direct call from IpConnectivityMetrics
into NetdEventListenerService.
- this allows to remove the Parcelable implementation of DnsEvent
- transports information is added to DnsEvent.
Test: - simplified NetdEventListenerServiceTest covering dns logging
- updated IpConnectivityEventBuilderTest
- updated IpConnectivityMetricsTest
- $ runtest frameworks-net passes
- manually verified $ adb shell dumpsys connmetrics list proto
Bug:
34901696
Change-Id: I4fcd0ad7a7b85d587647f471a90c1e53a18fc95a
Merged-In: Ia4b33fd4212741152662a2adbb0533bd1b4902ee
(cherry picked from commit
0699cf98042a64e41ee076c464eb115a6579be08)
Jorim Jaggi [Fri, 14 Apr 2017 01:14:18 +0000 (01:14 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev
am:
4a2be133d4
Change-Id: Ibd7f89a49154bbf0bf89a5baa301e7912cf8db89
Jesse Hall [Fri, 14 Apr 2017 01:10:49 +0000 (01:10 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
am:
8cafe5d9b4
Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
Adam Lesinski [Fri, 14 Apr 2017 01:09:40 +0000 (01:09 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev
am:
b97d51a0d2
Change-Id: I25ee394a6950ca6cc85d66727847c32041a8a65b
TreeHugger Robot [Fri, 14 Apr 2017 01:08:49 +0000 (01:08 +0000)]
Merge "Connectivity metrics: add transports pretty printing" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 01:08:26 +0000 (01:08 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
am:
676bd21542
Change-Id: I0e806e12b361b90eb4f349a7624d5f5ce4c91a9b
Winson Chung [Thu, 13 Apr 2017 23:39:36 +0000 (16:39 -0700)]
Fixing animating bounds regression.
- Prior to ag/
1954388, we used getAnimatingBounds() to get the final target
bounds if animating or the current otherwise, but since we needed the
target bounds to calculate the window scale even after the animation
completes, the clearing of mBoundsAnimationTarget was removed.
This inadvertently broke the check in getAnimatingBounds() from ever
returning the current bounds (as it's never empty)! This CL fixes the
issue, and renames the related methods to better reflect what they are
doing going forward.
This caused a regression when calculating and notifying SysUI of the
movement bounds, which was never the current bounds, but the default
bounds. Leading the IME change to trigger the PIP to move down.
Bug:
37242422
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: Source hint rect animation still works
Change-Id: I532b0928ebfeaf95e9754a0254306af6fbb35833
Daniel Nishi [Fri, 14 Apr 2017 01:07:18 +0000 (01:07 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev
am:
74037d1287
Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
TreeHugger Robot [Fri, 14 Apr 2017 01:06:47 +0000 (01:06 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev
Yifan Hong [Wed, 5 Apr 2017 21:42:05 +0000 (14:42 -0700)]
Add Java API for libvintf.
android.os.VintfObject has two methods:
- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
compatible.
Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
36814503
Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
TreeHugger Robot [Fri, 14 Apr 2017 01:00:41 +0000 (01:00 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 00:58:04 +0000 (00:58 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 00:56:34 +0000 (00:56 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 00:56:14 +0000 (00:56 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev
Seigo Nonaka [Wed, 12 Apr 2017 04:00:27 +0000 (21:00 -0700)]
Use provided style for fallback font selection
If the developer gives some weight/italic to the Typeface.Builder
the fallback used the metadata in the font file. We should use
provided data instead.
This CL also adjusts upper and lower limits on weight, from 100..900 to
1..1000
Bug:
37257745
Bug:
37251569
Test: android.graphics.cts.TypefaceTest passes
Change-Id: I7cf390d96b49afcce359928373698b0c9a9babd8
Winson Chung [Tue, 11 Apr 2017 18:19:23 +0000 (11:19 -0700)]
Tightening up rotation behavior for PIP (2/3)
- Change BoundsAnimationController to be more consistent:
1) Ensure that on animation end is always called even when cancelled to
ensure animation start/end parity in the callbacks
2) Ensure that setPinnedStackSize() is only called between start/end
3) Prevent calling setPinnedStackSize() to the final bounds if the
animation is cancelled
- With that, we add a flag to cancel the current bounds animation when a
rotation happens while the bounds are animating. In addition, we also
add a check from AM to WM before applying the resize during the animation
in the case where WM sends the bounds to AM, but AM lock is held while
updating the exact stack bounds (once that finishes the old stale bounds
would have been applied)
- In addition, we can then move the handling of the of the rotation to the
config change update in WM, if we handle it before the other checks.
Bug:
36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I62c6df8b349971cc82a7898ae8b26834723faec5
Winson Chung [Mon, 10 Apr 2017 21:38:05 +0000 (14:38 -0700)]
Tightening up rotation behavior for PIP (1/3)
- Defer getting the default bounds until after the task has been reparented
to the pinned stack
- Also move pinned stack-related methods into pinned stack window
controller and listener
Bug:
36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ib2bd81ad9e2a3829b556177010f39c7512ba35bf
Christopher Tate [Fri, 14 Apr 2017 00:34:15 +0000 (17:34 -0700)]
Turn down dynamic toggle for background restriction policy
Bug
35248677
Test: manual
Change-Id: Ib2a85df27a0de7f205783506bd3d2afe2da92baf
Mady Mellor [Fri, 14 Apr 2017 00:20:15 +0000 (17:20 -0700)]
Visual changes to PIP drag to dismiss UI
Updated gradient asset, spacing, and added shadow to text
Test: Manual: have a PIP, move it around, observe drag to dismiss UI
Bug:
35358628
Change-Id: I8614468edfc14d0337d69184a7bbab5419f22ec3
Jeff Tinker [Fri, 14 Apr 2017 00:18:41 +0000 (00:18 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
am:
92fc8bdd51
Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50
TreeHugger Robot [Fri, 14 Apr 2017 00:09:38 +0000 (00:09 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev