Commit Graph

307499 Commits

Author SHA1 Message Date
songjinshi
96c92f25dd Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d am: d0e81464bd
am: c2b7dd0db4

Change-Id: Ia72af5433dae2d200503a91a92c91729eae1eadc
2017-02-14 18:20:15 +00:00
Erik Kline
ea50c00f28 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245 am: 8055dafb08
am: d850804723

Change-Id: I56a8b708178419d467abac0166f1be6c86b42491
2017-02-14 18:19:01 +00:00
Erik Kline
6bf2e10802 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db am: 663ec79cb2
am: ea7e8f7352

Change-Id: I5ca36fc3b7153b029174a49593ee769e06758729
2017-02-14 18:17:43 +00:00
Badhri Jagan Sridharan
f82013b425 Merge changes from topic 'pixel-c' into nyc-mr2-dev am: dee514fae3
am: fa207eb889  -s ours

Change-Id: If914a497b91b3c24be2872f0059c92503d8c467d
2017-02-14 18:16:29 +00:00
Peeyush Agarwal
1ea19d3463 Merge "Fix KeyboardShortcuts show" 2017-02-14 17:10:02 +00:00
TreeHugger Robot
3571b79c7f Merge "Pass targetSdkVersion specifier for SELinux labeling" 2017-02-14 16:54:46 +00:00
TreeHugger Robot
2c92e9daa4 Merge "Reject HMAC keys smaller than 64 bits." 2017-02-14 15:58:31 +00:00
TreeHugger Robot
02761acc67 Merge "Declarative downloadable fonts" 2017-02-14 15:39:04 +00:00
TreeHugger Robot
a10b057bb8 Merge "MonitoringCertTask no longer relies on software.device_admin" 2017-02-14 15:35:04 +00:00
Diego Perez
dacc137752 Merge "A bit of warning cleanup" 2017-02-14 15:25:37 +00:00
songjinshi
c2b7dd0db4 Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d
am: d0e81464bd

Change-Id: I8a2f552e3fa500f14e1912acbbbade3ea510715f
2017-02-14 14:39:14 +00:00
songjinshi
d0e81464bd Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18
am: f69a73793d

Change-Id: Ifcce0699f9434cf490f9b4b596ba7604208275c6
2017-02-14 14:34:13 +00:00
songjinshi
f69a73793d Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am: d530d1bf18

Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
2017-02-14 14:29:36 +00:00
Treehugger Robot
d530d1bf18 Merge "[NotificationManagerService]: Fixes the thread-safe issue." 2017-02-14 14:23:19 +00:00
TreeHugger Robot
ab582b762a Merge "Replace bitmap shaders with image shaders in test code" 2017-02-14 14:21:38 +00:00
Shreyas Basarge
bf6655b315 Merge "BackupManager#cancelBackups() API" 2017-02-14 13:53:33 +00:00
Shreyas Basarge
c3704427c9 BackupManager#cancelBackups() API
Introduces a cancelBackups() API for
BackupManager. When this function returns,
it is guaranteed that currently running
backup operations won't interact with
the active transport.

Bug: 34760860

Ref: https://docs.google.com/document/d/18MnfwkDfKNtXQBPRmL8vpVgfLgSWJsDja1Nm1QV5hOw/edit#heading=h.9p6yo0wx44k3

Test: GTS tests at ag/1893365

Change-Id: I67f78699bbe763ea71c85937fbc01a5b48694eed
2017-02-14 13:51:59 +00:00
Clara Bayarri
4b5a4d221f Declarative downloadable fonts
Implement support for downloadable font requests in xml. Given the
xml fonts feature in O, this adds support to not only declare
local font files as font resources, but also Downloadable fonts
from a fonts provider.

A provider returns a font family (of one or more files) given a
query, so the new attributes are added to the font-family tag.

Additionally, add support to pre-declare downloadable font resources
in the Android Manifest. These will then be fetched at app startup
time so they are available to use from the Typeface cache asap.

When retrieving downloadable fonts via resources, the cache is
checked to see if the font is already there and is used, otherwise
a request is sent to the provider and the default font is returned
as we need a result synchronously.

To do this, the developer declares an additional fonts xml resource
file with the list of fonts to preload and links it in the manifest
with a meta-data tag.

E.g.:

res/font/mydownloadedfont.xml

<font-family xmlns:android="http://schemas.android.com/apk/res/android"
        android:fontProviderAuthority="com.example.test.fontprovider"
        android:fontProviderQuery="myrequestedfont">
</font-family>

res/font/preloaded_fonts.xml

<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
    <font android:font="@font/mydownloadedfont" />
</font-family>

and in the AndroidManifest.xml

<meta-data android:name="preloaded_fonts"
    android:resource="@font/preloaded_fonts" />

Bug: 34660500, 34658116
Test: WIP, need to add more
Change-Id: I1d92555e115e241bf23b59e6f5c6cca6c7361de7
2017-02-14 13:32:41 +00:00
Derek Sollenberger
7183b6908b Merge "Deprecate Canvas save/saveLayer flags." 2017-02-14 13:31:21 +00:00
Robin Lee
7f5c91c6bc MonitoringCertTask no longer relies on software.device_admin
Added a test to validate that it still works the way it should before
and after the change.

Bug: 33258404
Bug: 35196414
Fix: 35129745
Test: runtest -x services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: also manual, instructions:
Test: (1) Disable software.device_admin from tablet_core_hardware, rebuild.
Test: (2) Install CA cert. Notification should appear.
Test: (3) Reboot. Notification should still be there.
Change-Id: Id992725c1844a2fffbde4d8acaba531e99f853ad
2017-02-14 13:29:31 +00:00
TreeHugger Robot
23a96af523 Merge "AOD: Fix contrast calculation" 2017-02-14 13:18:22 +00:00
Diego Perez
62253b6c60 A bit of warning cleanup
Test: Covered by existing tests
Change-Id: I3f27540efdb47e3c1db02f85c67c81e36d159a79
2017-02-14 12:36:18 +00:00
TreeHugger Robot
9031554c25 Merge "AOD: show AOD1 instead of AOD2 on double tap" 2017-02-14 12:28:35 +00:00
Diego Perez
646b78173a Merge "Fixes for animated vector drawables" 2017-02-14 12:23:11 +00:00
Ricky Wai
89c376ed66 Merge "Change "Long pressing work mode in quick settings" to managed profile settings" 2017-02-14 11:14:12 +00:00
Erik Kline
d850804723 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245
am: 8055dafb08

Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
2017-02-14 09:49:56 +00:00
Erik Kline
8055dafb08 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc
am: 02e71f6245

Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
2017-02-14 09:45:56 +00:00
Erik Kline
02e71f6245 Merge "Verify duplicate upstream notifications are ignored"
am: 3d57eb0bdc

Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
2017-02-14 09:41:53 +00:00
TreeHugger Robot
4dba3cdf89 Merge "Refactor auto-fill" 2017-02-14 09:37:53 +00:00
Treehugger Robot
3d57eb0bdc Merge "Verify duplicate upstream notifications are ignored" 2017-02-14 09:32:56 +00:00
Erik Kline
624bf3d7f6 Verify duplicate upstream notifications are ignored
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32163131

Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
2017-02-14 15:55:57 +09:00
Erik Kline
ea7e8f7352 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db
am: 663ec79cb2

Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
2017-02-14 06:25:47 +00:00
Erik Kline
663ec79cb2 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3
am: 76e6f790db

Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
2017-02-14 06:21:44 +00:00
Erik Kline
76e6f790db Merge "Cleanup in the face of upstream error"
am: ed6d75d5f3

Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
2017-02-14 06:17:38 +00:00
Gopinath Elanchezhian
027d72ebe6 Merge "Add Simulate maitanance mode in app startup test cases." 2017-02-14 06:17:36 +00:00
Erik Kline
ed6d75d5f3 Merge "Cleanup in the face of upstream error" 2017-02-14 06:09:22 +00:00
TreeHugger Robot
a4fad13438 Merge "Add missing final and @GuardedBy" 2017-02-14 06:03:02 +00:00
Svet Ganov
782043caf8 Refactor auto-fill
* Fix a layering issue where auto-fill manager which is in view
  depended on activity which is in app

* Moved auto-fill classes to view or service based on their
  purpose and removed dependecy on the classes in view to the
  classes in service

* Push state to local auto-fill manager whether auto-fill is
  enabled to avoid making IPC for every focus transition if
  the user did not enable the feature

* Remove unnecessary offload to messages when handling calls
  to auto-fill manager service as these are made over a oneway
  interface and in general they do almost no work and typically
  we do these on the binder thread

* Removed id from data set and fill response as the provider
  can embed everything it needs to id them in the auth pending
  intent

* Enforce the auth UI to be only an activity as this will work
  with multi-window, recents, and back and also does not require
  draw on top of other app special permission

* Authentication also no longer requires passing a remotable
  callback to the auth activity but the activity handles the
  request as if called for a result

* Handling stopping of a user to clean up in-memory state as
  well as handling when a user gets unlocked as a provider may
  be non-direct boot aware

* User the correct context when creating an auto-fill manager

* Move the receiver that listens for requests to hide system
  windows to the manager service as the UI is a singleton and
  no need every per-user state to register its own

* Removed extras from dataset as the only case a provider needs
  to associate state with a dataset is for auth and the provider
  can embed this data in the auth pending intent

Test: manual and CTS

Change-Id: I4bc54c13cf779d7f6fdb3ab894637f9fac73f603
2017-02-13 21:31:37 -08:00
Svetoslav Ganov
fc582f046b Merge "I will reimplement this correctly later - it conflicts with the CL with API changes and the deadline is tomorrow and I would like to avoid staying until midnight again." 2017-02-14 05:25:09 +00:00
Svetoslav Ganov
1e4dff2fa4 I will reimplement this correctly later - it conflicts with the CL with API changes and the deadline is tomorrow and I would like to avoid staying until midnight again.
Change-Id: I1ec11eee2bfbca5e833140136ca22768130c6c43
2017-02-14 05:22:29 +00:00
Badhri Jagan Sridharan
fa207eb889 Merge changes from topic 'pixel-c' into nyc-mr2-dev
am: dee514fae3

Change-Id: I4038d1fbd429fcedc4a379d764b5ef5c59dcce1d
2017-02-14 03:40:33 +00:00
TreeHugger Robot
dee514fae3 Merge changes from topic 'pixel-c' into nyc-mr2-dev
* changes:
  Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
  Fix handling usb dialog for wall chargers. [DO NOT MERGE]
2017-02-14 03:34:51 +00:00
Erik Kline
8ea45483fc Cleanup in the face of upstream error
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.

Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
2017-02-14 12:20:39 +09:00
TreeHugger Robot
f4de7400fd Merge "Use floating bar to show authentication sign-in request." 2017-02-14 03:17:40 +00:00
TreeHugger Robot
858a5d9958 Merge "Ensure network connectivity on app start." 2017-02-14 03:09:36 +00:00
TreeHugger Robot
d7fd4aff66 Merge "Add metrics for settings" 2017-02-14 03:01:31 +00:00
TreeHugger Robot
c2b2d8ee9b Merge "Camera: Update doc to allow unchanged configs in finalizeOutputConfigs" 2017-02-14 02:33:17 +00:00
Ningyuan Wang
58e6fe321f Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 am: 9d1be09462
am: c2c718b717

Change-Id: I82b27a1b4f0891d1153efdfb0058fe10b533316c
2017-02-14 02:32:04 +00:00
Yohei Yukawa
b37d8bddc9 Add missing final and @GuardedBy
This is a follow up CL to my previous CL [1], where I forgot to add
final and @GuardedBy to InputMethodManagerService#mStartInputMap.

 [1]: I9921b381e02106dbffff5e0b3d13f0a1245ce807
      6db3bfe33d

Test: Compile
Bug: 35079353
Change-Id: I29897752e16573a27bf700b1d822889789c35292
2017-02-13 18:29:05 -08:00
Ningyuan Wang
c2c718b717 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586
am: 9d1be09462

Change-Id: If221ae36424377501677f70a3601509328268604
2017-02-14 02:28:30 +00:00