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

resolve merge conflicts of 92f7794d90 to master

Browse Source 
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
This commit is contained in:
Christine Franks
2017-09-19 18:23:44 -07:00
parent 530de5be78 92f7794d90
commit bfb671391d
5 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
View File

@@ -194,8 +194,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
@VisibleForTesting
boolean hasUsedNightDisplay(Context context) {
final ContentResolver cr = context.getContentResolver();
final long lastActivatedTimeMillis = Secure.getLong(cr,
Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME, -1);
return lastActivatedTimeMillis > 0;
return Secure.getInt(cr, Secure.NIGHT_DISPLAY_AUTO_MODE, 0) != 0
|| Secure.getString(cr, Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME) != null;
}
}