Selim Cinek
41e8e50aae
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am: c687aa08c1
...
am: 5736b1689a
2017-01-12 17:28:47 +00:00
Selim Cinek
c2b9092dc8
Allowing heads-up notifications now on the lock screen am: ab24dc9f29
...
am: f6c9c21745
2017-01-12 17:27:44 +00:00
Selim Cinek
03edc608f1
Introduced the visual stability manager am: add9526b1d
...
am: 85e481140c
2017-01-12 17:26:51 +00:00
Selim Cinek
fa7f04d980
Removing notifications always immediately when swiping them away am: 5e018206e2
...
am: fabd50de62
2017-01-12 17:25:58 +00:00
Mark Salyzyn
22221f6981
Merge "resolve merge conflicts of ec7e2a164c to master"
2017-01-12 17:23:01 +00:00
TreeHugger Robot
49a4330425
Merge "Import translations. DO NOT MERGE"
2017-01-12 17:20:35 +00:00
TreeHugger Robot
df0a2865b3
Merge "Import translations. DO NOT MERGE"
2017-01-12 17:20:09 +00:00
Jeff Sharkey
e90aacae13
Merge "Fix the build!"
2017-01-12 17:18:24 +00:00
Jeff Sharkey
35140ce8d0
Fix the build!
...
Change-Id: I4200cbd0190b384a94a8b59988c19101b127cbf9
2017-01-12 10:16:27 -07:00
TreeHugger Robot
f0e2f5e8a2
Merge "Import translations. DO NOT MERGE"
2017-01-12 17:14:15 +00:00
TreeHugger Robot
4064710ac8
Merge "Introduce set/getFontVariationSettings."
2017-01-12 16:59:24 +00:00
Jeff Sharkey
0078e1b777
Add support for fallback categories.
...
When an app doesn't define a category, look for a fallback category
in a hard-coded list. This change only defines a fallback for a
single package, but device-specific overlays can be used to provide
more detailed fallback lists.
The precidence order is: app manifest > installer hint > fallback
Test: builds, boots, fallback categories work
Bug: 33815939
Change-Id: I1f5ca76fb7e5743a4500c0a1230a754266f34d9e
2017-01-12 09:53:44 -07:00
Jeff Sharkey
9bc89af3f1
Add API for apps to declare their "category".
...
Upcoming platform features need to cluster apps together into broad
categories to help summarize information to users. (For example,
when presenting battery, network, and disk usage.)
We are tightly limiting the set of categories to keep them easily
presentable to users when summarizing information. This feature is
not designed to be a general-purpose taxonomy, nor should it be
allowed to become one.
Older apps may not have defined a category in their manifests, so
allow the installing app to define a category on their behalf.
Test: builds, boots
Bug: 33815939
Change-Id: I785b882ee7c18072ef47d56e0fc19ad72888e1b7
2017-01-12 09:53:44 -07:00
TreeHugger Robot
cb2c57338b
Merge "[DPM] Improvements to the network logs batch finalization mechanism"
2017-01-12 16:52:28 +00:00
Mark Salyzyn
173215d1b2
resolve merge conflicts of ec7e2a164c to master
...
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
2017-01-12 08:28:30 -08:00
Selim Cinek
5736b1689a
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
...
am: c687aa08c1
2017-01-12 16:14:47 +00:00
Selim Cinek
f6c9c21745
Allowing heads-up notifications now on the lock screen
...
am: ab24dc9f29
2017-01-12 16:14:34 +00:00
Selim Cinek
85e481140c
Introduced the visual stability manager
...
am: add9526b1d
2017-01-12 16:13:47 +00:00
Selim Cinek
fabd50de62
Removing notifications always immediately when swiping them away
...
am: 5e018206e2
2017-01-12 16:13:00 +00:00
Mark Salyzyn
ec7e2a164c
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b
...
am: 6dacea63d9
2017-01-12 15:59:48 +00:00
Selim Cinek
c687aa08c1
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
...
* changes:
Allowing heads-up notifications now on the lock screen
Introduced the visual stability manager
Removing notifications always immediately when swiping them away
2017-01-12 15:55:30 +00:00
Mark Salyzyn
6dacea63d9
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b
...
am: d1740f0f5b
2017-01-12 15:46:20 +00:00
Mark Salyzyn
d1740f0f5b
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
...
am: 2225a0640b
2017-01-12 15:32:50 +00:00
Mark Salyzyn
2225a0640b
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
2017-01-12 15:18:26 +00:00
Michal Karpinski
3dcd39c14a
[DPM] Improvements to the network logs batch finalization mechanism
...
The full batch will still be available to DPC if there were no
network logs pending.
Added some more debug logging to better investigate the issues.
Test: manual for both cases - pending batch was empty and non-empty,
with locally decreased timeout
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Bug: 34157435
Bug: 29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
2017-01-12 15:05:12 +00:00
TreeHugger Robot
e86e6d7595
Merge "Fix NPE when trying to add starting window"
2017-01-12 15:01:53 +00:00
TreeHugger Robot
b237ddcb84
Merge "Remove PO support from HardwarePropertiesManager"
2017-01-12 14:01:26 +00:00
TreeHugger Robot
3e17ea13c1
Merge "[DPM] Allow lower strong auth timeout on debuggable builds"
2017-01-12 13:46:09 +00:00
Jorim Jaggi
73f8820ccc
Fix NPE when trying to add starting window
...
Container may already have been removed, so protect against that
situation.
Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes: 34227241
2017-01-12 14:31:49 +01:00
Bill Yi
511a402620
Import translations. DO NOT MERGE
...
Change-Id: I6daeaa7d995e86318f60d1bb0e1094f9bcdd9709
Auto-generated-cl: translation import
2017-01-12 05:23:03 -08:00
Przemyslaw Szczepaniak
a5db0b90d9
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2 am: 95322ffdde
...
am: 4103219402
2017-01-12 11:44:11 +00:00
Przemyslaw Szczepaniak
4103219402
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2
...
am: 95322ffdde
2017-01-12 11:39:05 +00:00
Michal Karpinski
2df5919faa
[DPM] Allow lower strong auth timeout on debuggable builds
...
Timeout can be set to lower than 1h on debuggable builds (eng, user-debug)
using persist.sys.min_str_auth_timeo system property. This allows manual
testers to more easily carry out testing scenarios.
Bug: 29825955
Test: manual without setting the property: if timeout is set to less than 1h, it's clamped to 1h
Test: manual with setting the property: on user-debug build with "adb root && adb shell setprop persist.sys.min_str_auth_timeo 30000"
Change-Id: I8cd871e3d04b2c6c7164f684b9a6a24e7292bfab
2017-01-12 11:36:20 +00:00
Przemyslaw Szczepaniak
95322ffdde
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a
...
am: 3556fd53a2
2017-01-12 11:33:15 +00:00
Przemyslaw Szczepaniak
3556fd53a2
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
...
am: c0d71fa38a
2017-01-12 11:27:32 +00:00
Treehugger Robot
c0d71fa38a
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
2017-01-12 11:20:06 +00:00
TreeHugger Robot
8c5a321327
Merge "Modify WifiNetworkScoreCache to print full Score."
2017-01-12 11:13:37 +00:00
Pavel Grafov
a902e5c255
Merge "Let profile owners also receive OTA notification."
2017-01-12 11:12:01 +00:00
Pavel Grafov
dfbfca2015
Merge "Fix DevicePolicyManagerServiceMigrationTest."
2017-01-12 11:08:54 +00:00
Erik Kline
17ca0e43a1
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 am: 082263344a
...
am: 190d8591ce
2017-01-12 10:49:31 +00:00
Martijn Coenen
41ab7eed92
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 am: eed50c1809
...
am: cfc4e21899
2017-01-12 10:44:38 +00:00
Erik Kline
190d8591ce
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
...
am: 082263344a
2017-01-12 10:43:26 +00:00
Bill Yi
09934a01fa
Import translations. DO NOT MERGE
...
Change-Id: Id49c8f367fafd803a9ce3f2f7fbd8c5b9c6dc7bc
Auto-generated-cl: translation import
2017-01-12 02:41:59 -08:00
Martijn Coenen
cfc4e21899
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9
...
am: eed50c1809
2017-01-12 10:38:28 +00:00
Erik Kline
082263344a
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b
...
am: cbd3d8b356
2017-01-12 10:33:24 +00:00
Martijn Coenen
eed50c1809
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb
...
am: aa4d6f1be9
2017-01-12 10:31:35 +00:00
Erik Kline
cbd3d8b356
Merge "Simplify UpstreamNetworkMonitor callback handling"
...
am: f9f5cf9d9b
2017-01-12 10:26:43 +00:00
Martijn Coenen
aa4d6f1be9
Merge "Use new read(Embedded)Buffer APIs."
...
am: 34ed84d4eb
2017-01-12 10:25:01 +00:00
Treehugger Robot
f9f5cf9d9b
Merge "Simplify UpstreamNetworkMonitor callback handling"
2017-01-12 10:18:24 +00:00
Treehugger Robot
34ed84d4eb
Merge "Use new read(Embedded)Buffer APIs."
2017-01-12 10:17:40 +00:00
