| Index: components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java
|
| diff --git a/components/cronet/android/api/src/org/chromium/net/UserAgent.java b/components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java
|
| similarity index 93%
|
| rename from components/cronet/android/api/src/org/chromium/net/UserAgent.java
|
| rename to components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java
|
| index 5abd81c93277195082a2aa8401ab1bd7bc6826f8..221a1b2794d05b7986ef6872da0614152c4cf666 100644
|
| --- a/components/cronet/android/api/src/org/chromium/net/UserAgent.java
|
| +++ b/components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -package org.chromium.net;
|
| +package org.chromium.net.impl;
|
|
|
| import android.content.Context;
|
| import android.content.pm.PackageInfo;
|
| @@ -10,19 +10,20 @@ import android.content.pm.PackageManager;
|
| import android.content.pm.PackageManager.NameNotFoundException;
|
| import android.os.Build;
|
|
|
| +import org.chromium.net.ApiVersion;
|
| +
|
| import java.util.Locale;
|
|
|
| /**
|
| * Constructs a User-Agent string.
|
| */
|
| -final class UserAgent {
|
| +public final class UserAgent {
|
| private static final Object sLock = new Object();
|
|
|
| private static final int VERSION_CODE_UNINITIALIZED = 0;
|
| private static int sVersionCode = VERSION_CODE_UNINITIALIZED;
|
|
|
| - private UserAgent() {
|
| - }
|
| + private UserAgent() {}
|
|
|
| /**
|
| * Constructs a User-Agent string including application name and version,
|
| @@ -87,12 +88,10 @@ final class UserAgent {
|
| PackageManager packageManager = context.getPackageManager();
|
| String packageName = context.getPackageName();
|
| try {
|
| - PackageInfo packageInfo = packageManager.getPackageInfo(
|
| - packageName, 0);
|
| + PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
|
| sVersionCode = packageInfo.versionCode;
|
| } catch (NameNotFoundException e) {
|
| - throw new IllegalStateException(
|
| - "Cannot determine package version");
|
| + throw new IllegalStateException("Cannot determine package version");
|
| }
|
| }
|
| return sVersionCode;
|
|
|