Jakub Pawlowski
233cbbfb25
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
...
am: 658e1ddc7e
2017-05-26 23:21:23 +00:00
Android Build Merger (Role)
658e1ddc7e
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
2017-05-26 23:17:33 +00:00
Jakub Pawlowski
a441f455ee
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
...
am: 2acc8e28dd
2017-05-26 23:16:35 +00:00
Jakub Pawlowski
bf79e36f57
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
...
am: 138f75bbc8
2017-05-26 23:14:27 +00:00
Jakub Pawlowski
138f75bbc8
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
...
am: 2acc8e28dd
2017-05-26 23:09:23 +00:00
Jakub Pawlowski
2acc8e28dd
Merge "Add 32 and 128 bit Service Data parsing."
...
am: 725e212de3
2017-05-26 23:02:45 +00:00
Yuka Anami
0c7e85da54
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
...
am: bb63b4a376
2017-05-26 22:58:49 +00:00
Treehugger Robot
725e212de3
Merge "Add 32 and 128 bit Service Data parsing."
2017-05-26 22:53:29 +00:00
TreeHugger Robot
bb63b4a376
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
2017-05-26 22:52:04 +00:00
Ruchi Kandoi
cd9d36f665
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781
...
am: 3377e1fc91
2017-05-26 22:45:24 +00:00
Ruchi Kandoi
3377e1fc91
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319
...
am: a50b393781
2017-05-26 22:37:26 +00:00
Yuka Anami
50b8697071
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314
...
am: 269cb38bb9
2017-05-26 22:30:19 +00:00
Ruchi Kandoi
a50b393781
Merge "Make NFC AIDL callbacks oneway"
...
am: 99c805b319
2017-05-26 22:30:16 +00:00
Yuka Anami
269cb38bb9
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83
...
am: 0d9dfc4314
2017-05-26 22:23:53 +00:00
Treehugger Robot
99c805b319
Merge "Make NFC AIDL callbacks oneway"
2017-05-26 22:20:58 +00:00
Yuka Anami
0d9dfc4314
Merge "Add ID_LENGTH field for Empty type record"
...
am: b1f0bb6f83
2017-05-26 22:17:15 +00:00
Sergey Vasilinets
6190ec9b03
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
...
am: bacaffa497
2017-05-26 22:16:00 +00:00
Sergey Vasilinets
bacaffa497
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
2017-05-26 22:11:27 +00:00
Treehugger Robot
b1f0bb6f83
Merge "Add ID_LENGTH field for Empty type record"
2017-05-26 22:07:39 +00:00
Julius D'souza
d9251bad5b
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
...
am: f4abac4d8f
2017-05-26 22:05:44 +00:00
Julius D'souza
eac7a439d0
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission.
...
am: b9a71dfd38
2017-05-26 22:00:41 +00:00
Julia Reynolds
f9d4e9428b
Merge "Properly read vibration setting on boot." into oc-dev
...
am: 2c324042df
2017-05-26 21:52:17 +00:00
TreeHugger Robot
f4abac4d8f
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
2017-05-26 21:49:00 +00:00
TreeHugger Robot
2c324042df
Merge "Properly read vibration setting on boot." into oc-dev
2017-05-26 21:43:29 +00:00
Felipe Leme
d51bf85e6c
Merge "Disable autofill while user setup is not completed." into oc-dev
...
am: 3540463b74
2017-05-26 21:35:41 +00:00
TreeHugger Robot
3540463b74
Merge "Disable autofill while user setup is not completed." into oc-dev
2017-05-26 21:29:50 +00:00
Jakub Pawlowski
45033a7e57
Add 32 and 128 bit Service Data parsing.
...
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
2017-05-26 21:11:24 +00:00
Amith Yamasani
85e6dd985b
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
...
am: 22c2be0fbc
2017-05-26 21:10:40 +00:00
Ruchi Kandoi
5dc487d588
Make NFC AIDL callbacks oneway
...
Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2017-05-26 21:06:25 +00:00
Alan Viverette
9c0108304c
Merge "Resolve inflate attr against default package" into oc-dev
...
am: bd8fb0e71d
2017-05-26 21:03:07 +00:00
TreeHugger Robot
22c2be0fbc
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
2017-05-26 20:56:12 +00:00
TreeHugger Robot
bd8fb0e71d
Merge "Resolve inflate attr against default package" into oc-dev
2017-05-26 20:54:57 +00:00
Yuka Anami
c03eaa6853
Add ID_LENGTH field for Empty type record
...
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
(cherry picked from commit ef9d0a480ef72a4ff0de5b5afa3661cff81fd8b5)
2017-05-26 20:53:59 +00:00
Yuka Anami
dd0c9bbbb2
Add ID_LENGTH field for Empty type record
...
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
2017-05-26 20:53:10 +00:00
Jason Monk
d58b721e55
Merge "Fix QS Detail header touch target" into oc-dev
...
am: b25f52c042
2017-05-26 20:52:10 +00:00
Jason Monk
b25f52c042
Merge "Fix QS Detail header touch target" into oc-dev
2017-05-26 20:44:17 +00:00
Julia Reynolds
745c15477b
Properly read vibration setting on boot.
...
Test: runtest systemui-notification
Change-Id: I400bc3df441524abe4973d4d6bccc7ef30a2e1c7
Fixes: 37865035
2017-05-26 20:35:16 +00:00
Selim Cinek
f802c625ca
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
...
am: 76926df97e
2017-05-26 19:50:42 +00:00
Selim Cinek
76926df97e
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
2017-05-26 19:45:04 +00:00
Jason Monk
daeafccfa9
Merge "Make volume dialog pick up on theme changes" into oc-dev
...
am: 1ec5d85a41
2017-05-26 19:08:22 +00:00
Felipe Leme
fa2d7ffb95
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
...
am: 7990306b8b
2017-05-26 19:06:25 +00:00
Jason Monk
1ec5d85a41
Merge "Make volume dialog pick up on theme changes" into oc-dev
2017-05-26 19:03:46 +00:00
Alan Viverette
a7cec30f98
Resolve inflate attr against default package
...
Change-Id: I2de0f79fb4918770c9f816934b1fc4953073a4f1
Fixes: 38456890
Test: LayoutInflaterTest#testInclude
2017-05-26 14:55:49 -04:00
TreeHugger Robot
7990306b8b
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
2017-05-26 18:55:38 +00:00
Adam Lesinski
01b95f9067
Merge "Add ResourceId validation helper method" into oc-dev
...
am: 24c18af14a
2017-05-26 18:55:15 +00:00
Adam Lesinski
138d2a65b3
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
...
am: e229113d46
2017-05-26 18:49:11 +00:00
Adam Lesinski
24c18af14a
Merge "Add ResourceId validation helper method" into oc-dev
2017-05-26 18:45:28 +00:00
Adam Lesinski
e229113d46
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
2017-05-26 18:42:48 +00:00
Steven Moreland
e76b15c830
Merge "HIDL: C++ Java parity" into oc-dev
...
am: 579110398d
2017-05-26 18:38:09 +00:00
Steven Moreland
579110398d
Merge "HIDL: C++ Java parity" into oc-dev
2017-05-26 18:31:58 +00:00
