Commit Graph

766 Commits

Author SHA1 Message Date
Nathan Harold
f434a6d308 Re-Enable Starting of the IpSecService
am: b72821747c

Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
2017-09-26 22:11:58 +00:00
Neil Fuller
8acdb8aa65 resolve merge conflicts of 83c367aa5b to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07
2017-09-20 13:43:28 +01:00
Neil Fuller
782a79f47a Fix reliability triggering
Fix reliability triggering in the time zone update
feature. The reliability triggering is there to
resume an update check when things go wrong. For
example, if the device is turned off after a
time zone data app is updated but before the time
zone update process has finished pulling the data
out and installing it in /data. The reliability
trigger happens when the device is idle and will
complete the work.

The idle triggering currently doesn't work as it
was implemented incorrectly.

The code has been changed to use the
JobScheduler to trigger on idle and scheduling
has been made explicit.

Unit tests run with:

make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above
Test: Manual testing: adb shell am idle-maintenance, adb logcat/adb shell dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug: 65657543
Change-Id: Ibb2c537955d09a5d538c50490dae94a518522f19
Merged-In: Ibb2c537955d09a5d538c50490dae94a518522f19
(cherry picked from commit cd1a109b87)
2017-09-19 17:10:46 +01:00
Nathan Harold
b72821747c Re-Enable Starting of the IpSecService
This reverts commit 41004ff411.

Bug: 64800246
Test: compilation
Change-Id: I4f5e3cd23001b9d94b3f6dc9fcfe731a90650e6e
2017-09-12 19:25:09 -07:00
Przemyslaw Szczepaniak
eefdc2c6f8 Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am: 82d2bd4e40 am: f9caecd124
am: be71148d49

Change-Id: Ibd4c390c610b20f2809b06045fa38e6231175599
2017-08-03 10:52:34 +00:00
Przemyslaw Szczepaniak
f9caecd124 Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am: 82d2bd4e40

Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
2017-08-03 10:30:05 +00:00
Alison Cichowlas
9e7e827d05 Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am: 39a556f1d8

Change-Id: Idd341f7969c40184327428fc27b9f597dab57905
2017-08-01 18:18:49 +00:00
Przemyslaw Szczepaniak
fbe00fa62b Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
This reverts commit 27c461ab3c.

I'm taking alternative approach, telephony code will treat "GMT" value as it would be unset. This is fine because GMT is a synthetic value that would never be set from other sources. 

Change-Id: I889a844bfd75b7730a5d967065d27de03ef3ce2f
Test: flashed device, tested manually 
Bug: 64056758
2017-08-01 11:48:03 +00:00
Alison Cichowlas
f0afd8c14e Move ShutdownThread calls to system ui thread.
Test: Manual
Fixes: 63680790

Change-Id: I6e431efb7594ba86311aac857dbf3970d48044ac
2017-07-31 16:13:54 -04:00
Neil Fuller
a63d879f4c Merge "Alter condition for starting RulesManagerService" am: a338679173 am: 3e928af733
am: 4c1ade06b3

Change-Id: I5e42752fcf6e1bee87db8c78daaa5d6364a15ee5
2017-07-27 13:49:21 +00:00
Neil Fuller
3e928af733 Merge "Alter condition for starting RulesManagerService"
am: a338679173

Change-Id: I442dd6a30f022f92fb3fd8a0a5cca58d4ec77208
2017-07-27 13:35:23 +00:00
Treehugger Robot
a338679173 Merge "Alter condition for starting RulesManagerService" 2017-07-27 13:25:49 +00:00
Przemyslaw Szczepaniak
2b923c07a7 Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am: 9b9e823096 am: 7dc29d076f
am: 18eb3b4ff1

Change-Id: Id90d02a05413812df90a3691f1f4b8a99e74669b
2017-07-27 13:24:07 +00:00
Przemyslaw Szczepaniak
7dc29d076f Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am: 9b9e823096

Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
2017-07-27 13:11:44 +00:00
Przemyslaw Szczepaniak
27c461ab3c Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal 
to deduce a timezone from sim card information.

This reverts commit 20e020536e.

Bug: 64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
2017-07-27 10:37:55 +00:00
Neil Fuller
e0af2bb2bf Alter condition for starting RulesManagerService
Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.

disableNonCoreServices is apparently not used.

Bug: 64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Merged-In: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
2017-07-26 12:15:48 +01:00
Christine Franks
379c317ab8 Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
am: 484115b77d

Change-Id: Id9f50aeab430db43e9f18bcdfd80b6dcac2c43a7
2017-07-21 19:00:31 +00:00
Christine Franks
b7c929977c DO NOT MERGE - Remove RetailDemoModeService
Bug: 62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
2017-07-21 15:51:32 +00:00
Eino-Ville Talvala
7dcff07a28 Merge changes from topic 'camera-tron' into oc-dr1-dev
am: 280165118d

Change-Id: Ic163d728471cb1cdb7dfc60955452a0f1491dc76
2017-07-14 17:26:49 +00:00
Eino-Ville Talvala
e91012ba88 CameraServiceProxy: Add CameraStatsLoggingService, event dumping
- Collect camera usage events (facing, client, duration)
- Create a JobService that triggers roughly daily to dump events

Test: Verify that 'adb shell cmd jobscheduler run android 13254266'
   prints out all camera usage since last run
Bug: 32449509
Change-Id: I13172e6e68f5cdb94685a112c74d270d1dda45bf
2017-07-13 11:14:09 -07:00
Tianjie Xu
c7fed42403 Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
2017-06-13 00:58:53 +00:00
Tianjie Xu
40b3f29341 Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546
am: d04d501ce7

Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
2017-06-13 00:46:27 +00:00
Tianjie Xu
d04d501ce7 Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
2017-06-12 23:55:23 +00:00
Tianjie Xu
3a66fc41e3 Fix the issue that uncrypt isn't called under quiescent mode
OTA fails on fugu under quiescent mode because the reboot reason changes
from "recovery-update" to "recovery-update,quiescent". The new reason
isn't checked in shutdown thread so that shutdown thread doesn't call
uncrypt properly before rebooting into recovery.

Bug: 62324707
Test: Recreated and fixed the "block.map" missing failure on fugu.

Change-Id: I110653cd64dbbdc71e89ead2197bf023a7c054e8
2017-06-12 11:16:59 -07:00
Andreas Gampe
f037caed37 Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
2017-06-08 05:54:32 +00:00
Andreas Gampe
dc7f65ac64 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 20:08:44 +00:00
Andreas Gampe
5085ef71e9 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

Bug: 37272346
Test: m
Test: Device boots
Merged-In: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 11:26:15 -07:00
Keun-young Park
067cf3e883 add skeleton CarServiceHelperService
- CarServiceHelperService is a companion service for car service which
  is used only for car product.
- HelperService starts car service and provide necessary interface
  for system server internal behavior control.

bug: 62342376
Test: test boot-up
Change-Id: I1728437434eab36bd2df6ba0a534731823bbcf35
2017-06-05 14:27:25 -07:00
TreeHugger Robot
f4abac4d8f Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev 2017-05-26 21:49:00 +00:00
Nathan Harold
e1612d04de Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev am: 72cdc9cdae
am: 6bebfa708d

Change-Id: I5cb366480533afdb767144d760198d8ddfaa3dbd
2017-05-24 22:09:57 +00:00
Nathan Harold
6bebfa708d Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
am: 72cdc9cdae

Change-Id: I7c6360ee53e929e0e03dcd1e1a767d98af94f620
2017-05-24 21:56:36 +00:00
Nathan Harold
41004ff411 [DO NOT MERGE] Do not start the IpSecService
Bug: 37688915
Test: build+boot marlin
Change-Id: I69635c832ac64104d753735a3e22f0442b0fa910
2017-05-23 18:40:29 -07:00
Keun-young Park
8c52b3fd49 Merge "Wait for keyguard draw before stopping boot animation" into oc-dev am: ff4cc4ebb5
am: 0bdd7ae68e

Change-Id: I53c900ebe66b99fc1596d57e0f43dc32248f8340
2017-05-19 20:22:54 +00:00
Keun-young Park
0bdd7ae68e Merge "Wait for keyguard draw before stopping boot animation" into oc-dev
am: ff4cc4ebb5

Change-Id: I1c1437f83387aa4974ee991502018f5b59baf248
2017-05-19 20:14:50 +00:00
Keun-young Park
4136d2d54b Wait for keyguard draw before stopping boot animation
- Add check for keyguard drawn before stopping boot animation.
  Otherwise blank screen can happen.
- Bind to keyguard service when sysui is launched to reduce waiting
  time later.
- Increase keyguard timeout to 5 secs if it is not boot completed.
  Otherwise (= normal screen on), keep the current 1 sec.
  This timeout can still lead into blank screen so use bigger timeout
  during boot-up to prevent such case.

bug: 37867510
Test: many reboots

Change-Id: Ibfdc42d295bb1d3f5b4ea316fe5aca9ab875e4be
2017-05-19 09:20:28 -07:00
Abodunrinwa Toki
b59fe93059 Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
am: 41564af248

Change-Id: Ib7c77dd40de6c72bd843af680f59972708a4b121
2017-05-09 17:26:01 +00:00
Abodunrinwa Toki
41564af248 Merge "Remove redundant TextClassificationService" into oc-dev
am: 104590844e

Change-Id: Ib2881e478819eaff8910f5a0982e4f048e4bb7c1
2017-05-09 16:59:38 +00:00
Abodunrinwa Toki
3de110bbb7 Remove redundant TextClassificationService
Text classification is now being done entirely in the app's proccess.
See android.view.textclassifier.TextClassificationManager
Reverts Ic428d00f291e268211866b3fc6b7acbc3eb04e1e

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Fixes: 36852122
Change-Id: Iffff3ab6e7d3b761576eb6bdcd5032db34b7a1b2
2017-05-09 13:51:03 +01:00
Andrew Scull
0fa80ba8fd Merge "Move LockSettingsService into locksettings package." 2017-05-09 09:48:53 +00:00
Neil Fuller
056156f616 Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

This contains a cherry-pick / conflict resolution of
commit 68f666693a after an automerger skip.
(cherry picked from commit 68f666693a)

Test: See above.
Bug: 31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-05 17:09:58 +01:00
Neil Fuller
68f666693a Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-04 19:46:47 +01:00
Neil Fuller
328532ab13 Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-04 19:28:49 +01:00
Andrew Scull
507d11c935 Move LockSettingsService into locksettings package.
This service now has a large number of support classes so move them into
their own package to keep things tidy and easier to refactor.

Bug: 37090873
Test: runtest frameworks-services -c com.android.server.locksettings.LockSettingsServiceTests
Test: runtest frameworks-services -c com.android.server.locksettings.LockSettingsShellCommandTest
Test: runtest frameworks-services -c com.android.server.locksettings.SyntheticPasswordTests
Change-Id: Ic3cd00e6565749defd74498a3491c3d9b914ad90
2017-05-04 14:46:28 +01:00
Julius D'souza
b9a71dfd38 Add WearDisplayService to the system server;
add a SET_DISPLAY_OFFSET permission.

Merged-In: I253766553a507e2ada7d631501d8d32d863a823f

Bug: 36515029
Test: No build failure; SystemServer loads as usual.
Change-Id: I253766553a507e2ada7d631501d8d32d863a823f
(cherry picked from commit 069f46ca34)
2017-05-01 13:14:56 -07:00
Eugene Susla
c8dbc86216 Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am: 992541027b
am: 58b0a7d3e9

Change-Id: Ief8d667257fec6c14f9626b69431545cb47b5575
2017-04-20 13:24:59 +00:00
Andrew Scull
5d7027db6e Add implementation alternatives for OemLockManager.
The OEM lock can be implemented with the persistent data block or the
OemLock HAL.

Test: gts-tradefed run gts -m GtsOemLockServiceTestCases -t com.google.android.oemlock.gts.OemLockServiceTest
Bug: 34766843
Change-Id: I16b31785d9af58212a050a299ef024be3139f0c6
2017-04-19 15:17:34 +01:00
Eugene Susla
0d3dd12fa0 Move CompanionDeviceManagerService to a place of its own
Fixes: 37473452
Test: Ensure companion devi9ce functionality still works
Change-Id: I89624217373b3e77296c71f9429387d99d15e236
2017-04-18 12:00:11 -07:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
2017-04-14 18:01:24 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Svet Ganov
cb98d9d6f3 Merge "Add autofill feature API" into oc-dev am: a402d6dd2f
am: bbef731c2d

Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de
2017-04-12 22:22:39 +00:00