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

Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-21 01:20:19 +00:00
committed by Android (Google) Code Review
parent 6a60322157 49e96960d4
commit dbc020983d
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/autofill/AutofillManager.java
View File

@@ -91,7 +91,7 @@ public final class AutofillManager {
* android.service.autofill.FillCallback#onSuccess(android.service.autofill.FillResponse)} with
* a {@code FillResponse} that requires authentication, the Intent that launches the
* service authentication will contain the Bundle set by
* {@link android.service.autofill.FillResponse.Builder#setExtras(Bundle)} on this extra.
* {@link android.service.autofill.FillResponse.Builder#setClientState(Bundle)} on this extra.
*
* <p>
* Type: {@link android.os.Bundle}
@@ -107,7 +107,7 @@ public final class AutofillManager {
*
* @deprecated Use {@link android.service.autofill.FillRequest#FLAG_MANUAL_REQUEST}
*/
// TODO(b/33197203): remove
// TODO(b/33197203): remove (and change value of private flags)
@Deprecated
public static final int FLAG_MANUAL_REQUEST = 0x1;

18
services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
View File

@@ -49,6 +49,7 @@ import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
import android.service.autofill.FillEventHistory;
import android.service.autofill.FillEventHistory.Event;
import android.service.autofill.FillRequest;
import android.service.autofill.FillResponse;
import android.service.autofill.IAutoFillService;
@@ -521,8 +522,7 @@ final class AutofillManagerServiceImpl {
*/
void setAuthenticationSelected() {
synchronized (mLock) {
mEventHistory.addEvent(
new FillEventHistory.Event(FillEventHistory.Event.TYPE_AUTHENTICATION_SELECTED, null));
mEventHistory.addEvent(new Event(Event.TYPE_AUTHENTICATION_SELECTED, null));
}
}
@@ -531,8 +531,8 @@ final class AutofillManagerServiceImpl {
*/
void setDatasetAuthenticationSelected(@Nullable String selectedDataset) {
synchronized (mLock) {
mEventHistory.addEvent(new FillEventHistory.Event(
FillEventHistory.Event.TYPE_DATASET_AUTHENTICATION_SELECTED, selectedDataset));
mEventHistory.addEvent(
new Event(Event.TYPE_DATASET_AUTHENTICATION_SELECTED, selectedDataset));
}
}
@@ -541,7 +541,7 @@ final class AutofillManagerServiceImpl {
*/
void setSaveShown() {
synchronized (mLock) {
mEventHistory.addEvent(new FillEventHistory.Event(FillEventHistory.Event.TYPE_SAVE_SHOWN, null));
mEventHistory.addEvent(new Event(Event.TYPE_SAVE_SHOWN, null));
}
}
@@ -550,8 +550,7 @@ final class AutofillManagerServiceImpl {
*/
void setDatasetSelected(@Nullable String selectedDataset) {
synchronized (mLock) {
mEventHistory.addEvent(
new FillEventHistory.Event(FillEventHistory.Event.TYPE_DATASET_SELECTED, selectedDataset));
mEventHistory.addEvent(new Event(Event.TYPE_DATASET_SELECTED, selectedDataset));
}
}
@@ -601,7 +600,8 @@ final class AutofillManagerServiceImpl {
}
}
if (mEventHistory == null || mEventHistory.getEvents().size() == 0) {
if (mEventHistory == null || mEventHistory.getEvents() == null
|| mEventHistory.getEvents().size() == 0) {
pw.print(prefix); pw.println("No event on last fill response");
} else {
pw.print(prefix); pw.println("Events of last fill response:");
@@ -609,7 +609,7 @@ final class AutofillManagerServiceImpl {
int numEvents = mEventHistory.getEvents().size();
for (int i = 0; i < numEvents; i++) {
FillEventHistory.Event event = mEventHistory.getEvents().get(i);
final Event event = mEventHistory.getEvents().get(i);
pw.println(" " + i + ": eventType=" + event.getType() + " datasetId="
+ event.getDatasetId());
}

2
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -17,7 +17,7 @@
package com.android.server.autofill;
import static android.view.autofill.AutofillManager.FLAG_MANUAL_REQUEST;
import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;
import static android.view.autofill.AutofillManager.FLAG_START_SESSION;
import static android.view.autofill.AutofillManager.FLAG_VALUE_CHANGED;
import static android.view.autofill.AutofillManager.FLAG_VIEW_ENTERED;