aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnonymous <no-reply@google.com>2017-02-24 17:40:37 +0000
committerJeff Davidson <jpd@google.com>2017-03-01 18:12:34 -0800
commitc0552da8fc0b28ffb1cd4bf56f88ccf6c8f762dc (patch)
tree46968a89f96c9e1c2195b467f388685fc1e9fd6a /src
parent9424680a52bc7804e0c7f0f71c2f1ea282f10cdd (diff)
downloadvolley-c0552da8fc0b28ffb1cd4bf56f88ccf6c8f762dc.tar.gz
Import of Volley from GitHub to AOSP.android-o-preview-1o-preview
GitOrigin-RevId: bc67181a21ab41a7c6b4a4adbcb9935bff888622 Change-Id: I8c1fd9c4cb81acf443169506ce920f030e3ea31c
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java3
-rw-r--r--src/test/java/com/android/volley/mock/ShadowSystemClock.java16
-rw-r--r--src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java16
-rw-r--r--src/test/java/com/android/volley/utils/CacheTestUtils.java16
-rw-r--r--src/test/java/com/android/volley/utils/ImmediateResponseDelivery.java16
5 files changed, 65 insertions, 2 deletions
diff --git a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java
index 18f8597..73468b9 100644
--- a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java
+++ b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java
@@ -21,6 +21,7 @@ import com.android.volley.AuthFailureError;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerFuture;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -29,6 +30,8 @@ import android.os.Bundle;
* An Authenticator that uses {@link AccountManager} to get auth
* tokens of a specified type for a specified account.
*/
+// TODO: Update this to account for runtime permissions
+@SuppressLint("MissingPermission")
public class AndroidAuthenticator implements Authenticator {
private final AccountManager mAccountManager;
private final Account mAccount;
diff --git a/src/test/java/com/android/volley/mock/ShadowSystemClock.java b/src/test/java/com/android/volley/mock/ShadowSystemClock.java
index f2697cc..6d75d4b 100644
--- a/src/test/java/com/android/volley/mock/ShadowSystemClock.java
+++ b/src/test/java/com/android/volley/mock/ShadowSystemClock.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.android.volley.mock;
import android.os.SystemClock;
diff --git a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
index 917ddb4..055005f 100644
--- a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
+++ b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.android.volley.toolbox;
import android.content.Context;
diff --git a/src/test/java/com/android/volley/utils/CacheTestUtils.java b/src/test/java/com/android/volley/utils/CacheTestUtils.java
index 898d055..03a2909 100644
--- a/src/test/java/com/android/volley/utils/CacheTestUtils.java
+++ b/src/test/java/com/android/volley/utils/CacheTestUtils.java
@@ -1,4 +1,18 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.volley.utils;
diff --git a/src/test/java/com/android/volley/utils/ImmediateResponseDelivery.java b/src/test/java/com/android/volley/utils/ImmediateResponseDelivery.java
index 666e0d0..235716d 100644
--- a/src/test/java/com/android/volley/utils/ImmediateResponseDelivery.java
+++ b/src/test/java/com/android/volley/utils/ImmediateResponseDelivery.java
@@ -1,4 +1,18 @@
-// Copyright 2011 Google Inc. All rights reserved.
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.volley.utils;