Commit Graph

85813 Commits

Author SHA1 Message Date
TreeHugger Robot
aacb53a34d Merge "Use String instead of byte[] to represent alias in KeyEntryRecoveryData." 2018-01-09 23:54:21 +00:00
TreeHugger Robot
6b7bf94740 Merge "incidentd: dumping jobscheduler to proto" 2018-01-09 23:15:19 +00:00
Kevin Hufnagle
742bacc9bc Merge "docs: Revised descriptions of binding and connecting to services." 2018-01-09 22:54:01 +00:00
TreeHugger Robot
381752d1c1 Merge "Lower FSP on window animation too" 2018-01-09 22:37:32 +00:00
Myles Watson
efd3bab0c2 Merge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0 am: 152b4f28b0
am: 96f4e49339

Change-Id: Ie321dd5d94bbc827d88855b634bc6a538d432918
2018-01-09 22:34:23 +00:00
Myles Watson
96f4e49339 Merge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0
am: 152b4f28b0

Change-Id: I765260e8358d6c7f34a72b5f3ef4601579aebf03
2018-01-09 22:26:57 +00:00
Tomasz Wasilczyk
89ee93ac4a Merge "Implement front-end APIs for config flags." 2018-01-09 22:20:14 +00:00
Treehugger Robot
37275780c0 Merge "BluetoothProfile: Add Object Push Profile (OPP)" 2018-01-09 22:10:01 +00:00
Victor Hsieh
dacb02bf5a Merge "Move zygote's seccomp setup to post-fork" am: 5d33c10a96
am: b629f9e12c

Change-Id: I7d4c6b22c70955a9f594b0e55149a203df56f6fc
2018-01-09 21:58:58 +00:00
Treehugger Robot
5d33c10a96 Merge "Move zygote's seccomp setup to post-fork" 2018-01-09 21:41:19 +00:00
TreeHugger Robot
d4fed0ae19 Merge "Add hidden APIs that return user start/unlock time." 2018-01-09 21:35:14 +00:00
gaochong
6404cb7f65 Merge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b
am: 0a0a49a022

Change-Id: I8e623f3e8493d1147fcf873fb6491e83b2c2edfe
2018-01-09 21:34:50 +00:00
Benedict Wong
e65973c571 Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
am: 764a0b739a

Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5
2018-01-09 21:23:35 +00:00
Mehdi Alizadeh
6f1b1c8848 Merge "Updates comment for SOFT_AP_TIMEOUT_ENABLED" 2018-01-09 21:11:18 +00:00
Eino-Ville Talvala
190e388ffe Merge "Camera2: Add MOTION_TRACKING capability/intent, and lens poseReference" 2018-01-09 21:08:00 +00:00
TreeHugger Robot
47966f8f49 Merge "Update on a few DevicePolicyManager APIs for affiliated PO" 2018-01-09 21:04:29 +00:00
gaochong
0a0a49a022 Merge "Fix ResolverActivity don't show items" am: e251bb72ed
am: 7fd3a8d08b

Change-Id: Ia76b696bcd1ec5763ec3da41fae4c8c2bce9b820
2018-01-09 20:47:22 +00:00
Hans Boehm
57fe793d31 Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2 am: c9e7c10afb
am: f81791c141

Change-Id: Ide59ad63505d92503da64bb70691ff370a548746
2018-01-09 20:46:35 +00:00
Makoto Onuki
b708cbe2b6 Lower FSP on window animation too
Test: manual test with setprop debug.hwui.fps_divisor 4
Bug: 66945974
Change-Id: I4b637ed30003a9eae008b093f9e3d8b2a2f09319
2018-01-09 12:40:35 -08:00
Treehugger Robot
e251bb72ed Merge "Fix ResolverActivity don't show items" 2018-01-09 20:30:29 +00:00
Victor Hsieh
6a4a339832 Move zygote's seccomp setup to post-fork
Before this change, seccomp filter setup is as early as in zygote's main
function.  To make it possible to split app and system server's filter,
this postpone the setup to after fork.  It also starts to call app
specific and system server specific setup function.

In terms of performance since this happens at fork, the measure shows
the overhead is negligible.  Assuming 130 instruction in the BPF, on
walleye, even when running on little core with fixed low frequency, each
setup took about 60.9us on average.  When it runs on big core with
higher frequency, it took about 39.3us.

Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Bug: 63944145

Change-Id: I748735b478405098beac1e200d911c13ea60e380
Merged-In: I748735b478405098beac1e200d911c13ea60e380
2018-01-09 20:16:01 +00:00
Kweku Adams
85f2fbcb1f incidentd: dumping jobscheduler to proto
Bug: 65750819
Test: flash device and check incident.proto output
Also test: $ cts-tradefed run cts-dev --module CtsIncidentHostTestCases --test com.android.server.cts.JobSchedulerIncidentTest
Change-Id: I4abc01ca893edcbaf4d2254e4f807e06f5cb91f8
2018-01-09 12:05:39 -08:00
Dmitry Dementyev
07c765553d Use String instead of byte[] to represent alias in KeyEntryRecoveryData.
Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Iac74fe856b43faa602ea1c2d9172f669826f4011
2018-01-09 12:03:27 -08:00
Makoto Onuki
73dded28af Add hidden APIs that return user start/unlock time.
Bug: 69456806
Test: Manual test with "watch dumpsys-user"
Change-Id: I68ed4ef53c707ed7c8cb8be4165052f942ea8ccd
2018-01-09 11:57:55 -08:00
Benedict Wong
764a0b739a Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a
2018-01-09 19:51:19 +00:00
TreeHugger Robot
df86ddb3f9 Merge "Move zygote's seccomp setup to post-fork" 2018-01-09 19:43:10 +00:00
Hans Boehm
f81791c141 Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
am: c9e7c10afb

Change-Id: I70169c5eeb5dbdaa751ea7b9369feb3663d79952
2018-01-09 19:38:55 +00:00
Kevin Hufnagle
34acbc9bf9 docs: Revised descriptions of binding and connecting to services.
Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.

Test: make ds-docs

Bug: 63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
2018-01-09 11:36:03 -08:00
Jeff Sharkey
834ce2d499 Merge "Start using new reserved disk GID." 2018-01-09 19:27:41 +00:00
Etan Cohen
e73f12ff8c Merge changes I620d8e72,I532ca35c
* changes:
  [RTT2] System API for a Responder Configuration
  [RTT2] Baseline public Wi-Fi RTT API
2018-01-09 19:16:51 +00:00
TreeHugger Robot
fe3cc4b996 Merge "Initial commit of updatable media API" 2018-01-09 19:05:15 +00:00
Patrick Baumann
229d2cdba3 Merge "Revert "Move signing data into SigningDetails container"" 2018-01-09 18:39:45 +00:00
Kodlee Yin
245a749dd6 Merge "Fix compatibility in MessagingStyle." 2018-01-09 18:22:07 +00:00
Benedict Wong
a954f20f46 Merge "Add validation to IpSecConfig algorithm setters" 2018-01-09 18:18:28 +00:00
TreeHugger Robot
345d957f45 Merge "Deprecates classes associated with old ContextHubManager APIs" 2018-01-09 16:26:29 +00:00
Patrick Baumann
3d70a03aa9 Revert "Move signing data into SigningDetails container"
This reverts commit 47117fcd78.

Reason for revert: boot time regression (b/71718267)

Change-Id: Ice00e63a68ea3aede847c17cc3acda2d0a6b2f24
Bug: 71718267
Bug: 68860689
2018-01-09 16:17:37 +00:00
Ricky Wai
3eb9f7accb Merge "Change Network Watchlist feature flag" 2018-01-09 16:02:18 +00:00
Alex Chau
7fbe61dc20 Update on a few DevicePolicyManager APIs for affiliated PO
- Disallow managed profile from disabling keyguard and statusBar as it
  has no effect
- Removed the ability for affiliated profile owner to set device owner
  lockscreen message, as the message is not per user but set globally,
  where the original intention is to set a per user lockscreen message
- Updated javadoc accordingly

Bug: 64383519
Test: Invoking setKeyguardDisabled and setStatusBarDisabled with managed profile fails
Change-Id: Ib3fdf44f55a7c5913ea38647c582bc962329c842
2018-01-09 11:13:22 +00:00
TreeHugger Robot
0b921eacb5 Merge "Make SystemApi retained at runtime" 2018-01-09 09:33:14 +00:00
TreeHugger Robot
7ede382ce3 Merge "WorkSource: Fix WorkSource#remove for chained worksources." 2018-01-09 08:46:22 +00:00
gaochong
cbe2c55a69 Fix ResolverActivity don't show items
ResolverActivity sort the list resolved intent with AsyncTask.
The method sort hold CountDownLatch to wait the time-consuming
operation. In some case, the operation doesn't end and the
CountDownLatch can't be released.The default excutor of AsyncTask
is serial. There should release CountDownLatch in destroy()
to avoid this case.

Change-Id: Ie10126f735d9f511dfe086c21f3f5ffaeb831086
Signed-off-by: gaochong <gaochong@xiaomi.com>
Test: manual - repeatedly test ResolverActivity show correctly
Bug: 71730061
2018-01-09 14:02:23 +08:00
Jeff Sharkey
d658207876 Merge "Wire up reserved blocks presence for tests." 2018-01-09 05:40:53 +00:00
Siyamed Sinir
29a2bd7a19 Merge "Prevent crash for Span change events" 2018-01-09 04:34:48 +00:00
Mehdi Alizadeh
57ae55cbef Updates comment for SOFT_AP_TIMEOUT_ENABLED
Bug: 68712445
Change-Id: Ic47917a608e78454f3060487741c5a0e1f6c15a4
Test: None
2018-01-08 19:21:05 -08:00
TreeHugger Robot
a2fe748e7a Merge "Duration format for tunable settings" 2018-01-09 03:19:03 +00:00
Sudheer Shanka
710971a286 Merge "Add a global setting to turn on/off the proc state cpu times tracking." 2018-01-09 02:28:51 +00:00
TreeHugger Robot
973e7eba7e Merge "Work on issue #70859548: Reduce amount of time spent collecting pss data" 2018-01-09 01:29:00 +00:00
Christine Franks
6198ec6303 Merge "Remove DEMO_USER_SETUP_COMPLETE" 2018-01-09 00:56:08 +00:00
Sudheer Shanka
5c19b897dd Add a global setting to turn on/off the proc state cpu times tracking.
Bug: 66953194
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: atest hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java
Change-Id: Id26476ad77c95994f358d8bd59b6c2e6513c4c54
2018-01-08 16:25:16 -08:00
Myles Watson
fa792b97a5 BluetoothProfile: Add Object Push Profile (OPP)
Test: toggle Bluetooth
Change-Id: I5aec940ba3d6c6364c2de667426d98d0b3cea0c6
2018-01-09 00:13:03 +00:00