Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ExternalTimeSuggestion to android.app.time" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-11 09:48:40 +00:00
committed by Android (Google) Code Review
parent de3ce41f28 87f56209e6
commit e90010e463
11 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/timedetector/ExternalTimeSuggestion.aidl → core/java/android/app/time/ExternalTimeSuggestion.aidl
View File

@@ -14,6 +14,6 @@
* limitations under the License.
*/
package android.app.timedetector;
package android.app.time;
parcelable ExternalTimeSuggestion;

2
core/java/android/app/timedetector/ExternalTimeSuggestion.java → core/java/android/app/time/ExternalTimeSuggestion.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.timedetector;
package android.app.time;
import android.annotation.NonNull;
import android.annotation.Nullable;

2
core/java/android/app/timedetector/ITimeDetectorService.aidl
View File

@@ -16,7 +16,7 @@
package android.app.timedetector;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ManualTimeSuggestion;
import android.app.timedetector.NetworkTimeSuggestion;

1
core/java/android/app/timedetector/TimeDetector.java
View File

@@ -19,6 +19,7 @@ package android.app.timedetector;
import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.annotation.SystemService;
import android.app.time.ExternalTimeSuggestion;
import android.content.Context;
import android.os.SystemClock;
import android.os.TimestampedValue;

1
core/java/android/app/timedetector/TimeDetectorImpl.java
View File

@@ -17,6 +17,7 @@
package android.app.timedetector;
import android.annotation.NonNull;
import android.app.time.ExternalTimeSuggestion;
import android.content.Context;
import android.os.RemoteException;
import android.os.ServiceManager;

2
core/tests/coretests/src/android/app/timedetector/ExternalTimeSuggestionTest.java → core/tests/coretests/src/android/app/time/ExternalTimeSuggestionTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.timedetector;
package android.app.time;
import static android.app.timezonedetector.ParcelableTestSupport.assertRoundTripParcelable;
import static android.app.timezonedetector.ParcelableTestSupport.roundTripParcelable;

2
services/core/java/com/android/server/timedetector/TimeDetectorService.java
View File

@@ -18,7 +18,7 @@ package com.android.server.timedetector;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ITimeDetectorService;
import android.app.timedetector.ManualTimeSuggestion;

2
services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java
View File

@@ -18,7 +18,7 @@ package com.android.server.timedetector;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ManualTimeSuggestion;
import android.app.timedetector.NetworkTimeSuggestion;

2
services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java
View File

@@ -23,7 +23,7 @@ import static java.util.stream.Collectors.joining;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.AlarmManager;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ManualTimeSuggestion;
import android.app.timedetector.NetworkTimeSuggestion;

2
services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
View File

@@ -28,7 +28,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ManualTimeSuggestion;
import android.app.timedetector.NetworkTimeSuggestion;

2
services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java
View File

@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.app.timedetector.ExternalTimeSuggestion;
import android.app.time.ExternalTimeSuggestion;
import android.app.timedetector.GnssTimeSuggestion;
import android.app.timedetector.ManualTimeSuggestion;
import android.app.timedetector.NetworkTimeSuggestion;