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

Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev

Browse Source 
am: a43cedbf25

Change-Id: Ia06d7cb7a5585a3f0865cb3500e48a4f02b082ea
This commit is contained in:
Kenny Guy
2018-04-03 16:24:26 -07:00
committed by android-build-merger
parent c4b36e5c8a a43cedbf25
commit ee67c91323
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/display/BrightnessTracker.java
View File

@@ -686,10 +686,15 @@ public class BrightnessTracker {
}
public ParceledListSlice<AmbientBrightnessDayStats> getAmbientBrightnessStats(int userId) {
ArrayList<AmbientBrightnessDayStats> stats = mAmbientBrightnessStatsTracker.getUserStats(
userId);
return (stats != null) ? new ParceledListSlice<>(stats) : new ParceledListSlice<>(
Collections.EMPTY_LIST);
if (mAmbientBrightnessStatsTracker != null) {
ArrayList<AmbientBrightnessDayStats> stats =
mAmbientBrightnessStatsTracker.getUserStats(
userId);
if (stats != null) {
return new ParceledListSlice<>(stats);
}
}
return ParceledListSlice.emptyList();
}
// Not allowed to keep the SensorEvent so used to copy the data we care about.

15
services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
View File

@@ -30,9 +30,11 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ParceledListSlice;
import android.database.ContentObserver;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.display.AmbientBrightnessDayStats;
import android.hardware.display.BrightnessChangeEvent;
import android.os.BatteryManager;
import android.os.Handler;
@@ -571,6 +573,19 @@ public class BrightnessTrackerTest {
assertEquals(event.batteryLevel, event2.batteryLevel, FLOAT_DELTA);
}
@Test
public void testNonNullAmbientStats() {
// getAmbientBrightnessStats should return an empty list rather than null when
// tracker isn't started or hasn't collected any data.
ParceledListSlice<AmbientBrightnessDayStats> slice = mTracker.getAmbientBrightnessStats(0);
assertNotNull(slice);
assertTrue(slice.getList().isEmpty());
startTracker(mTracker);
slice = mTracker.getAmbientBrightnessStats(0);
assertNotNull(slice);
assertTrue(slice.getList().isEmpty());
}
private InputStream getInputStream(String data) {
return new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
}