Philip P. Moltmann
62dc6583e6
Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev am: ebf3976
...
am: e3221b5
* commit 'e3221b5488aad3898abac47f6e28f4779c54543b':
Change hasCustomPrintIcon and setStatus as requested by API council.
2016-03-25 17:08:26 +00:00
Philip P. Moltmann
e3221b5488
Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev
...
am: ebf3976
* commit 'ebf397625ea5ee41af531da251d8d0cb89c26beb':
Change hasCustomPrintIcon and setStatus as requested by API council.
2016-03-25 17:00:11 +00:00
Philip P. Moltmann
ebf397625e
Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev
2016-03-25 16:50:36 +00:00
George Mount
8d01f110b3
Merge "Start seeked animators without waiting for start delay." into nyc-dev am: 68b296f
...
am: 919a3ef
* commit '919a3efdd7d5c7dbd64444cd4c2bd2e8509cd5a1':
Start seeked animators without waiting for start delay.
2016-03-25 14:25:28 +00:00
George Mount
919a3efdd7
Merge "Start seeked animators without waiting for start delay." into nyc-dev
...
am: 68b296f
* commit '68b296fce10a9385c87259475115a87af1872127':
Start seeked animators without waiting for start delay.
2016-03-25 14:21:32 +00:00
George Mount
68b296fce1
Merge "Start seeked animators without waiting for start delay." into nyc-dev
2016-03-25 14:10:01 +00:00
Alan Viverette
0e9485e9fc
Merge "Clean up popup window positioning" into nyc-dev am: 69a3345
...
am: 8151f98
* commit '8151f989492b58e6ecb1fdffbb0622e3a6fc5841':
Clean up popup window positioning
2016-03-25 13:33:03 +00:00
Alan Viverette
8151f98949
Merge "Clean up popup window positioning" into nyc-dev
...
am: 69a3345
* commit '69a3345ed5ad46b99a32b96018492d2ebdb9514c':
Clean up popup window positioning
2016-03-25 13:28:45 +00:00
Alan Viverette
69a3345ed5
Merge "Clean up popup window positioning" into nyc-dev
2016-03-25 13:22:49 +00:00
Paul Jensen
5deda4f970
Merge "Move ApfFilter from ConnectivityService to IpManager" into nyc-dev am: 732340c
...
am: ebdf3f0
* commit 'ebdf3f006854b04de2508314be7ac0788b6faa99':
Move ApfFilter from ConnectivityService to IpManager
2016-03-25 13:01:09 +00:00
Paul Jensen
ebdf3f0068
Merge "Move ApfFilter from ConnectivityService to IpManager" into nyc-dev
...
am: 732340c
* commit '732340cacdfaf80fb133cd74d7d57c25486eac1e':
Move ApfFilter from ConnectivityService to IpManager
2016-03-25 12:57:32 +00:00
Paul Jensen
f21b4dc1d6
Move ApfFilter from ConnectivityService to IpManager
...
There's a few advantages to having ApfFilter in IpManager:
1. If things go wrong, crashing a particular transport is less bad then
crashing ConnectivityService. We also don't want to use
ConnectivityService as a dumping ground for transport-specific logic.
2. This makes implementing WifiManager.MulticastLock a lot simpler and
safer because enabling/disabling it doesn't have to go through the
NetworkAgent, which could risk various races (e.g. installing a filter
into the wrong WiFi network).
3. IpManager is the ultimate source for LinkProperties for a particular
transport and since ApfFilter uses the LinkProperties it's better to
have it closely paired with the IpManager. Likewise, ApfFilter needs
to know the APF capabilities of the transport, so having it in
the transport avoids having to parcel this information through the
NetworkAgent.
Bug: 26238573
Change-Id: I99b85f2b64972f0e7572170ec5d1926081aa3429
2016-03-25 07:46:07 -04:00
Winson
12fc1b11a6
Merge "Dont scale task thumbnails." into nyc-dev am: 941a1f8
...
am: fccc734
* commit 'fccc7349aa94e51b6198233533d74a7bacbddb7a':
Don’t scale task thumbnails.
2016-03-25 03:59:32 +00:00
Winson
fccc7349aa
Merge "Dont scale task thumbnails." into nyc-dev
...
am: 941a1f8
* commit '941a1f81b0f50ff219a38476ffdba062b81d2fc4':
Don’t scale task thumbnails.
2016-03-25 03:56:48 +00:00
Winson Chung
941a1f81b0
Merge "Don’t scale task thumbnails." into nyc-dev
2016-03-25 03:51:09 +00:00
Winson
217009356e
Don’t scale task thumbnails.
...
- Changing task view thumbnail layout. In portrait, scale the thumbnail
to width for portrait screenshots, and apply the same scale to
landscape screenshots. In landscape, scale screenshots up to 1:1, and
tweak the app transition to clip the sides instead of scaling.
In both orientations, fill with the background color in the remaining
space.
- Moving some resources related to the title bar to be calculated
programmatically so that we can have different header bar sizes which
completely overlap the action bar in the screenshot in each
orientation.
- Constraining the task stack width in landscape to portrait
Bug: 27504677
Change-Id: Ic9b6fdde6dd728d9f2d20a8b89c05b3a350edfbf
2016-03-24 20:03:02 -07:00
Dianne Hackborn
bc2d5fe818
Merge "Fix issue #25817435 : Batterystats missing UIDs for secondary users" into nyc-dev am: 966f1c9
...
am: d6b6709
* commit 'd6b6709b21a99797be472a997ebd18d1d1f25c0f':
Fix issue #25817435 : Batterystats missing UIDs for secondary users
2016-03-25 02:00:05 +00:00
Dianne Hackborn
d6b6709b21
Merge "Fix issue #25817435 : Batterystats missing UIDs for secondary users" into nyc-dev
...
am: 966f1c9
* commit '966f1c93487b8bc9e259de11e1aaf0fb35b11dc2':
Fix issue #25817435 : Batterystats missing UIDs for secondary users
2016-03-25 01:57:17 +00:00
sergeyv
f065456698
Merge "Clean up setLayerType and setLayerPaint" into nyc-dev am: 4ce5653
...
am: cee94c7
* commit 'cee94c72b5dc0a2458344c9179ce6a80b70bb6e7':
Clean up setLayerType and setLayerPaint
2016-03-25 01:51:53 +00:00
Dianne Hackborn
966f1c9348
Merge "Fix issue #25817435 : Batterystats missing UIDs for secondary users" into nyc-dev
2016-03-25 01:50:33 +00:00
sergeyv
cee94c72b5
Merge "Clean up setLayerType and setLayerPaint" into nyc-dev
...
am: 4ce5653
* commit '4ce5653555b3140f1e6190c7cfa44ce416ce3693':
Clean up setLayerType and setLayerPaint
2016-03-25 01:49:03 +00:00
Sergei Vasilinetc
4ce5653555
Merge "Clean up setLayerType and setLayerPaint" into nyc-dev
2016-03-25 01:42:50 +00:00
Svetoslav Ganov
b277ea52eb
Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev am: d61a57f
...
am: d46c5c7
* commit 'd46c5c77aaeb2be6e53d37909fc233254508681e':
Guard against a NPE when using ParceledSliceList
2016-03-25 01:41:35 +00:00
Svetoslav Ganov
d46c5c77aa
Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev
...
am: d61a57f
* commit 'd61a57fdd035384870de275e36dfc3a2b58b8597':
Guard against a NPE when using ParceledSliceList
2016-03-25 01:38:52 +00:00
Svetoslav Ganov
d61a57fdd0
Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev
2016-03-25 01:33:38 +00:00
Ruben Brunk
a0148b8903
Merge "Allow current VrListenerService to read thermal info." into nyc-dev am: 41f02e5
...
am: 328ca70
* commit '328ca707537e18f313fe6c5642bca1e7d8d123fc':
Allow current VrListenerService to read thermal info.
2016-03-25 01:14:07 +00:00
Ruben Brunk
328ca70753
Merge "Allow current VrListenerService to read thermal info." into nyc-dev
...
am: 41f02e5
* commit '41f02e5d50bd9d13e17f44939b9499eab9404e90':
Allow current VrListenerService to read thermal info.
2016-03-25 01:11:21 +00:00
Ruben Brunk
41f02e5d50
Merge "Allow current VrListenerService to read thermal info." into nyc-dev
2016-03-25 01:08:18 +00:00
Svetoslav Ganov
b2c2e452e5
Guard against a NPE when using ParceledSliceList
...
bug:27558595
Change-Id: Idaa3b37d1d3bbb10b93e08ef1976758fde0b0ce3
2016-03-24 18:01:22 -07:00
Dianne Hackborn
9cfba35020
Fix issue #25817435 : Batterystats missing UIDs for secondary users
...
Change-Id: I9ad907571f04b5825d234758347659544a4de6ab
2016-03-24 17:31:28 -07:00
Philip P. Moltmann
d74d1e5491
Change hasCustomPrintIcon and setStatus as requested by API council.
...
Bonus: null advanced keys produced a exception deep in the print
spooler. Hence prevent null keys on the surface from now on.
Bug: 27716355
Change-Id: I3c064956f4e670cd7091437ade06605aa8d797b0
2016-03-24 16:53:36 -07:00
George Mount
907c177b04
Start seeked animators without waiting for start delay.
...
Bug 24872727
Change-Id: I954efd7113565f9b8f9a569f57960b8d91620758
2016-03-24 16:29:03 -07:00
sergeyv
342a7e6a7c
Clean up setLayerType and setLayerPaint
...
bug:21755299
Change-Id: I8f0953ccfc3d743abdecc8ec228ed3e1b6718c3c
2016-03-24 16:06:46 -07:00
Felipe Leme
fe66a2b3f0
Merge "Removed obsolete @NonNull." into nyc-dev am: 657c2fa
...
am: 8127d6f
* commit '8127d6f04fcfc316ae8c5b7ca38cad8c610e3d53':
Removed obsolete @NonNull.
2016-03-24 23:01:18 +00:00
Felipe Leme
8127d6f04f
Merge "Removed obsolete @NonNull." into nyc-dev
...
am: 657c2fa
* commit '657c2fa5c6076ffc9bba855d647ce5f5fa9748d9':
Removed obsolete @NonNull.
2016-03-24 22:55:20 +00:00
Felipe Leme
657c2fa5c6
Merge "Removed obsolete @NonNull." into nyc-dev
2016-03-24 22:14:38 +00:00
Alan Viverette
6acf2f909b
Clean up popup window positioning
...
- Only move the popup above the anchor when necessary
- Adjust the y position when displaying the popup above the anchor
rather than changing the popup gravity
- Reduce popup height if it's still too large after repositioning
Bug: 27819843
Change-Id: I1ecc235816a61b9431568a34d3116e286e092c11
2016-03-24 17:11:37 -04:00
Sharvil Nanavati
ba92a03522
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev am: 32dd848
...
am: cb94535
* commit 'cb9453589ed620ef17087120ead49097a76f9c69':
Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
2016-03-24 21:11:12 +00:00
Sharvil Nanavati
cb9453589e
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev
...
am: 32dd848
* commit '32dd84843615de6226ebcff81720599548203b60':
Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
2016-03-24 21:07:25 +00:00
Sharvil Nanavati
32dd848436
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev
2016-03-24 20:17:45 +00:00
Alex Klyubin
86acec8135
Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev am: e60d72f
...
am: c860aec
* commit 'c860aecc2f632ba7a0a1e53755b778b52645bb7e':
Ignore signature stripping protection for preinstalled APKs.
2016-03-24 19:54:08 +00:00
Alex Klyubin
c860aecc2f
Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev
...
am: e60d72f
* commit 'e60d72f49a10ba8d51fd184ed5604ca4d8225552':
Ignore signature stripping protection for preinstalled APKs.
2016-03-24 19:51:30 +00:00
Alex Klyubin
e60d72f49a
Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev
2016-03-24 19:46:44 +00:00
Alex Klyubin
9b59bc459b
Ignore signature stripping protection for preinstalled APKs.
...
The current build process may currently strip APK Signature Scheme v2
signatures from prebuilt APKs to be installed on the system or vendor
partitions. However, it leaves intact the signature scheme rollback
protections introduced by APK Signature Scheme v2. Due to a bug, when
the system extracts signer certificates from preinstalled APKs, it
encounters the rollback protection and aborts the extraction process.
This manifests itself as some preinstalled packages not appearing as
installed.
This change makes the system ignore signature scheme rollback
protections when extracting certificates from preinstalled APKs. This
is fine because the process of extracting certificates from
preinstalled APKs does not care about validity/integrity of signatures
and the APKs. It only cares about extracting signer certificates.
Bug: 27829513
Change-Id: I3bed463e776b057e93a0fce915db4014946be1f9
2016-03-24 12:02:20 -07:00
Alan Viverette
927b47ebf7
Merge "Ensure correct width and height are used during popup positioning" into nyc-dev am: 4a2f985
...
am: 6d00e8f
* commit '6d00e8f61a94fd87096453cf3a7456ab06268cc8':
Ensure correct width and height are used during popup positioning
2016-03-24 18:42:51 +00:00
Robin Lee
287216fdc6
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev am: 363e70d
...
am: 9148d2f
* commit '9148d2f74db74e1df017b9c7c73e8cd8fa0c50ff':
Declare provider.Settings intent for VPN fragment
2016-03-24 18:39:52 +00:00
Alan Viverette
6d00e8f61a
Merge "Ensure correct width and height are used during popup positioning" into nyc-dev
...
am: 4a2f985
* commit '4a2f9857c2759661a54d8705fb65e1ce500d1907':
Ensure correct width and height are used during popup positioning
2016-03-24 18:39:48 +00:00
Robin Lee
9148d2f74d
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev
...
am: 363e70d
* commit '363e70dd004e08d43f9908e913e48f2ae4fe1a28':
Declare provider.Settings intent for VPN fragment
2016-03-24 18:37:19 +00:00
Alan Viverette
4a2f9857c2
Merge "Ensure correct width and height are used during popup positioning" into nyc-dev
2016-03-24 18:33:57 +00:00
Robin Lee
363e70dd00
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev
2016-03-24 18:32:52 +00:00