Commit Graph

3058 Commits

Author SHA1 Message Date
Amin Shaikh
8bd0af0210 Merge "Setting for RecommendedNetworkEvaluator cache TTL"
am: 924878a752

Change-Id: I945898d88baa26f210cd0d86cdf064844af6f92e
2017-02-28 17:11:35 +00:00
Amin Shaikh
21496f6ee1 Setting for RecommendedNetworkEvaluator cache TTL
Bug: 19948759
Bug: 33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
2017-02-27 21:49:05 -08:00
Jack Yu
82c46d11f6 resolve merge conflicts of e091985bb5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
2017-02-24 18:47:01 -08:00
Jack Yu
d1d64730b9 Added a settings for CMAS message broadcast
This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Merged-In: Ic29be11b641f185219146d7fbb05561f5907ea76
Change-Id: Ic29be11b641f185219146d7fbb05561f5907ea76
2017-02-24 04:36:26 +00:00
Manu Cornet
0c09549ef4 Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am: e0e08f3f41

Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
2017-02-16 03:13:14 +00:00
Manu Cornet
512bbdde69 DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
  when switching between users.  With the policy in the phone/stack
  recents, this is fine, but with the grid recents, it no longer only
  applies when out of the historical window, so it is always wrong (it
  would normally be wrong if switching back from another user after the
  historical time of six hours).

  This CL will migrate the last stack active time to a per-user secure
  setting, which will be used going forward.

[This is a manual merge of change 1913535]

Bug: 35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
      return to the original user

Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
2017-02-15 16:37:19 -08:00
Justin Klaassen
46d3d6d313 Remove experimental twilight-based automatic brightness
am: 614f40ea01

Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
2017-02-06 23:28:27 +00:00
Justin Klaassen
614f40ea01 Remove experimental twilight-based automatic brightness
Bug: 31602449
Test: verified adaptive brightness no longer varies with twilight with
"brightness_use_twilight" set to "1".

Merged-In: I6b5f7310020b2128c2b292414a205b6052270a0a
Change-Id: Ife9bf6d0f76df791cb7e6a22505d9f551da19731
2017-02-02 09:23:49 -08:00
Daniel Nishi
2297fd2946 Add a flag to enable/disable the diskstats logging service.
am: 88e45dcd1f

Change-Id: Ie822eea68dc0a02c8fad1a838ff9bf23f738106f
2017-01-27 00:42:54 +00:00
Daniel Nishi
88e45dcd1f Add a flag to enable/disable the diskstats logging service.
Bug: 34704947
Test: Service tests
Change-Id: I224cfb38682f1fd2bd33750b664bd3aacdaa4bde
2017-01-26 14:24:28 -08:00
Andrew Sapperstein
e4910cc70a Add Settings.Global configs to high temp warning.
am: 63db9254cf

Change-Id: I63de4c9648158d8b19ed5d7eac1e75ca9b68d355
2017-01-24 20:08:42 +00:00
TreeHugger Robot
0a26aa9b31 Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev 2017-01-24 20:02:25 +00:00
Ta-wei Yen
e696c3d911 Fix typo in the IS_OMPT_VOICEMAIL field.
am: 57365441d4

Change-Id: I060ed862bd929875848753d77e6fc3ff8a48e32c
2017-01-24 02:18:26 +00:00
Andrew Sapperstein
63db9254cf Add Settings.Global configs to high temp warning.
Test: manual
Bug: 34480261
Merged-In: Icfd08c1c7dae456920b3978918ee01469e1dec95
Change-Id: I9ed444dfb89f86d94f3a0db699324318f5bf78d0
2017-01-23 16:50:58 -08:00
Ta-wei Yen
57365441d4 Fix typo in the IS_OMPT_VOICEMAIL field.
This cause the voicemail content provider to crash on query.

Bug: 34610526
Change-Id: I561ae6616fe66ea49630fa6c4eb9280fdc24b153
Fixes: 34610526
Test: VoicemailContentProviderTest
2017-01-23 12:50:35 -08:00
Amin Shaikh
17a040d48e Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c
am: 835db7f6b6

Change-Id: I5a8e3a4fc0198dbb7bf88e2bbcf0152b0b82a7fc
2017-01-21 05:38:45 +00:00
Amin Shaikh
835db7f6b6 Merge "Add Setting for curating saved open networks." am: b3b665de22
am: 2aec2f7a9c

Change-Id: If61be9f8e71bb89a8714c3f4a5eb10b04982cdf7
2017-01-21 05:34:12 +00:00
Amin Shaikh
2aec2f7a9c Merge "Add Setting for curating saved open networks."
am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
2017-01-21 05:27:06 +00:00
Amin Shaikh
8533622ae7 Add Setting for curating saved open networks.
Bug: 34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
2017-01-20 18:31:56 -08:00
Ta-wei Yen
1f296f7793 Add voicemail backup/restore columns
am: f48d5ce630

Change-Id: I2dd76b4107b9e7c75595fa3c49dcda74cebd2a09
2017-01-20 18:38:23 +00:00
Ta-wei Yen
c1a1348b99 Merge "Add voicemail backup/restore columns" into nyc-mr2-dev 2017-01-20 18:31:45 +00:00
Ta-wei Yen
f48d5ce630 Add voicemail backup/restore columns
BACKED_UP and RESTORED are required for dialer voicemail backup/restore
feature for N MR2. As there are no API bump the fields will be hidden
in NMR2. These fields will be made public in O.

ARCHIVED and IS_OMTP_VOICEMAIL is not used for NMR2, but added in
advance to avoid multiple database upgrades.

IS_OMTP_VOICEMAIL will be used in O to dedupe multiple apps implementing
VisualVoicemailService. All voicemail inserted by the service should
set this field to 1. The UI should only display voicemails with this
field set to 1 when the source_package is also the current active
VisualVoicemailService, as other sources represents the same source of
truth(the carrier) but is outdated.

For example, the query should be
WHERE (is_omtp_voicemail == 0) OR 
(is_omtp_voicemail == 1 AND source_package = "current.vvm.package")

Test: VoicemailProviderTest
Bug: 34463609
Change-Id: I0f3e58fabff2102adf5bc29d81dac46c7e71d410
2017-01-20 02:26:04 +00:00
Jeremy Joslin
9971919b64 New setting for recommendation request timeout. am: 44e2b84b27 am: 820ad03ba8
am: 00ccf31dbd

Change-Id: If14705a0e4c41dbd40ae90b46b37e5ad2b6e5c4b
2017-01-19 23:23:20 +00:00
Jeremy Joslin
00ccf31dbd New setting for recommendation request timeout. am: 44e2b84b27
am: 820ad03ba8

Change-Id: Ib4999e09073c74bb4594ce2e744032d3349dce94
2017-01-19 23:13:19 +00:00
Jeremy Joslin
820ad03ba8 New setting for recommendation request timeout.
am: 44e2b84b27

Change-Id: I8fd6e0c75d22d0f83db414a389c4d8caaf745469
2017-01-19 23:05:02 +00:00
Jeremy Joslin
44e2b84b27 New setting for recommendation request timeout.
Added a new global setting, NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
to control the maximum amount of time a recommendation request can
take.

Updated the NetworkScoreService to monitor the value and to update
its cached copy on observed changes.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 34060959
Change-Id: I6ff80178440794e4a5da39ee7b5164621316e7bd
Merged-In: I7650ee024e53dbc856cf20d7520a6eb252c73bdf
2017-01-19 13:18:22 -08:00
Santos Cordon
f85ab8306f Add Brightness setting for VR Mode.
am: d6a5660a2c

Change-Id: If371f485471eb1ab0a3e07964c197cb9b8ef1c9f
2017-01-11 03:12:05 +00:00
Santos Cordon
a00c235600 Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev 2017-01-11 03:02:55 +00:00
Santos Cordon
d6a5660a2c Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Change-Id: If3c3e81b592e0c6fd037e5783559683e5cb58379
2017-01-09 17:33:14 -08:00
Ruchi Kandoi
3a1ff62e5a nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 12:02:33 -08:00
Ruchi Kandoi
bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 18:48:51 +00:00
Selim Cinek
7e5cff0167 DO NOT MERGE Revert "Add Brightness setting for VR Mode."
am: 966045d070

Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
2016-12-27 19:22:04 +00:00
TreeHugger Robot
cbb057d3da Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 2016-12-27 19:08:59 +00:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
2016-12-27 18:28:40 +00:00
Santos Cordon
84334e25cd Add Brightness setting for VR Mode.
am: 84980c7a93

Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
2016-12-22 23:58:05 +00:00
Santos Cordon
cfdf27f24b Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev 2016-12-22 23:49:20 +00:00
Santos Cordon
84980c7a93 Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
2016-12-22 23:26:49 +00:00
pkanwar
21f8870abc DO NOT MERGE: Add UI toggle to control connections to carrier networks.
am: 57f383709b

Change-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8
2016-12-22 20:53:58 +00:00
pkanwar
57f383709b DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug: 31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
2016-12-22 11:12:02 -08:00
Hugo Benichi
fbbf03a3c2 DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
am: ff0b58627f

Change-Id: I5c433faa0d43202ae1169fdba4c42c09dd9c17dd
2016-12-13 04:08:18 +00:00
Hugo Benichi
ff0b58627f DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry pick from commit 05686dbb6b)

Change-Id: Ie7ca1638533479601c5983bb6e54705003561b6c
2016-12-13 10:20:03 +09:00
Hugo Benichi
8c9e4b68f0 DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry picked from commit 05686dbb6b)

Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d
2016-12-09 11:21:26 +09:00
Lorenzo Colitti
b92aa5bdfd Merge changes from topic 'framework-net-aosp'
* changes:
  DO NOT MERGE: [CS] Remove timeout event after first available
  DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
  DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
  DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
  DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
  DO NOT MERGE: Move FakeSettingsProvider to a common location.
  DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
  DO NOT MERGE: Add option to skip and avoid captive portals.
  DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
  DO NOT MERGE: Do not synchronize boolean reads/writes
  DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
  DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
  DO NOT MERGE: Support timeouts for requestNetwork() invocations.
  DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
2016-12-08 09:56:19 +00:00
Calvin On
1f64f3fd14 DO NOT MERGE: Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699

(cherry picked from commit be96da11cc)

Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696
2016-12-08 17:13:33 +09:00
Stephen Chen
609711bbd5 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f
am: fe9a20c980

Change-Id: I7bba392e349525dd55bb8b251554e81967424136
2016-12-07 23:18:15 +00:00
Treehugger Robot
faf3aa697f Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." 2016-12-07 23:00:26 +00:00
Stephen Chen
f1b75647a3 Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.
Bug: 32913919
Test: n/a
Change-Id: Ied075bdcc1ebb8f0a4bc0d3bf9758fa6719ce0b9
2016-12-06 16:21:14 -08:00