OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17d1709
)
Resolve inconsistent parcel read in NanoAppFilter
author
Arthur Ishiguro
<arthuri@google.com>
Mon, 25 Jun 2018 18:31:33 +0000
(11:31 -0700)
committer
syphyr
<syphyr@gmail.com>
Thu, 6 Sep 2018 02:19:14 +0000
(
04:19
+0200)
Bug:
77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266
(cherry picked from commit
abe5a73a4a81e312a1690fbc10a6b99ce98b699a
)
core/java/android/hardware/location/NanoAppFilter.java
patch
|
blob
|
history
diff --git
a/core/java/android/hardware/location/NanoAppFilter.java
b/core/java/android/hardware/location/NanoAppFilter.java
index
bf35a3d
..
c440949
100644
(file)
--- a/
core/java/android/hardware/location/NanoAppFilter.java
+++ b/
core/java/android/hardware/location/NanoAppFilter.java
@@
-83,7
+83,7
@@
public class NanoAppFilter {
mAppId = in.readLong();
mAppVersion = in.readInt();
mVersionRestrictionMask = in.readInt();
- mAppIdVendorMask = in.read
Int
();
+ mAppIdVendorMask = in.read
Long
();
}
public int describeContents() {
@@
-91,7
+91,6
@@
public class NanoAppFilter {
}
public void writeToParcel(Parcel out, int flags) {
-
out.writeLong(mAppId);
out.writeInt(mAppVersion);
out.writeInt(mVersionRestrictionMask);