Commit Graph

79288 Commits

Author SHA1 Message Date
Ruchi Kandoi
0c46762337 Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781 am: 3377e1fc91
am: cd9d36f665

Change-Id: Ia7d3be56ce538cbb40c72673b8c2824d0a76b82b
2017-05-30 13:17:11 +00:00
Yuka Anami
c476311eb3 Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314 am: 269cb38bb9
am: 50b8697071

Change-Id: I9fea9b4a931d334af711fa8e102594fb24f350fa
2017-05-30 13:14:44 +00:00
Sergey Vasilinets
16af41b1e3 Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev am: bacaffa497
am: 6190ec9b03

Change-Id: I7287ab2c8e765620df72326383e9361e1561478b
2017-05-30 13:11:47 +00:00
Julia Reynolds
8a94dae6ed Merge "Properly read vibration setting on boot." into oc-dev am: 2c324042df
am: f9d4e9428b

Change-Id: Ia55bfa05ebcf97262d9725028d67d3de5a4f33e5
2017-05-30 12:55:09 +00:00
Amith Yamasani
bb040c5a6b Merge "Use uptime instead of elapsed for measuring duration" into oc-dev am: 22c2be0fbc
am: 85e6dd985b

Change-Id: I1c6e773427438e0474ca44ba49dddfcafdaea3da
2017-05-30 12:41:10 +00:00
Alan Viverette
2f5608f38a Merge "Resolve inflate attr against default package" into oc-dev am: bd8fb0e71d
am: 9c0108304c

Change-Id: Icbf1a40dee9adc71785f21d8d4ba0b3f78c3e3ed
2017-05-30 12:35:32 +00:00
Phil Weaver
194a323963 Merge "Stop populating accessibility nodes with events" 2017-05-26 23:15:01 +00:00
Ruchi Kandoi
cd9d36f665 Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781
am: 3377e1fc91

Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359
2017-05-26 22:45:24 +00:00
Ruchi Kandoi
3377e1fc91 Merge "Make NFC AIDL callbacks oneway" am: 99c805b319
am: a50b393781

Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6
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

Change-Id: I8bf7940e14a0f2177ff46ef91575922b48716351
2017-05-26 22:30:19 +00:00
Tor Norbye
bcb5bca1f3 Merge "@IntDef and @StringDef must have source retention" 2017-05-26 22:25:59 +00:00
Yuka Anami
269cb38bb9 Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83
am: 0d9dfc4314

Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
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
Sergey Vasilinets
6190ec9b03 Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
am: bacaffa497

Change-Id: I7306408f2de87edc16d091713eba777a8e58b0ac
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
Julia Reynolds
f9d4e9428b Merge "Properly read vibration setting on boot." into oc-dev
am: 2c324042df

Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c
2017-05-26 21:52:17 +00:00
TreeHugger Robot
2c324042df Merge "Properly read vibration setting on boot." into oc-dev 2017-05-26 21:43:29 +00:00
TreeHugger Robot
3b3388ca64 Merge "Revert "Make synthetic password enabled by default"" 2017-05-26 21:14:27 +00:00
Amith Yamasani
85e6dd985b Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
am: 22c2be0fbc

Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d
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

Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21
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
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
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
TreeHugger Robot
a216aa29e3 Merge "Add a way to clear cached provider for tests in Settings class." 2017-05-26 20:29:24 +00:00
Qingxi Li
da1ae17f80 Merge "Add setting to indicate whether the eUICC is provisioned." 2017-05-26 20:05:39 +00:00
Paul Crowley
4519c0b1ef Revert "Make synthetic password enabled by default"
This reverts commit 4d36be3f1d.

Change-Id: Ic4615a30f4460541049de7175ad84db1d1fc8a86
2017-05-26 19:14:35 +00:00
Felipe Leme
0295914784 Merge "Moar Autofill Framework javadoc improvements:" into oc-dev am: 7990306b8b
am: fa2d7ffb95

Change-Id: I4734f1b5abbdf907692006355c2a60d13549819b
2017-05-26 19:12:33 +00:00
Felipe Leme
fa2d7ffb95 Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
am: 7990306b8b

Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8
2017-05-26 19:06:25 +00:00
Adam Lesinski
6ea208d059 Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a
am: 01b95f9067

Change-Id: I7097af67601496f56741a5f5e43f953ba8134ce0
2017-05-26 19:01:00 +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

Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294
2017-05-26 18:55:15 +00:00
Sudheer Shanka
aa3c30dfa2 Add a way to clear cached provider for tests in Settings class.
Bug: 38437704
Bug: 38433611
Test: manual
Change-Id: Id2803359644bd68a158294b6d801fc9cd316fc9f
2017-05-26 18:53:06 +00:00
Adam Lesinski
24c18af14a Merge "Add ResourceId validation helper method" into oc-dev 2017-05-26 18:45:28 +00:00
Paul Crowley
766ee6a881 Merge "Make synthetic password enabled by default" 2017-05-26 18:28:00 +00:00
Amith Yamasani
d0ddeba47b Use uptime instead of elapsed for measuring duration
in time taken to read cpu stats.

This should avoid super long durations > 10 secs that are occasionally
seen in system logs.

Bug: 62104524
Test: manual
Change-Id: I9ed985a61125a207b6d4f6297091bd11b4c78616
2017-05-26 09:46:58 -07:00
Tenghui Zhu
912684514a Merge "Create a new drawable after caching the DrawableContainer" into oc-dev am: 36d6a985cd
am: 246bf5cb9b

Change-Id: I0ef7196cdb87d40be15adff868ca4fcc17addd60
2017-05-26 16:32:10 +00:00
Tenghui Zhu
246bf5cb9b Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
am: 36d6a985cd

Change-Id: I53422934c6bf84033fdfff94c5eda79275e91b3a
2017-05-26 16:22:09 +00:00
Tenghui Zhu
36d6a985cd Merge "Create a new drawable after caching the DrawableContainer" into oc-dev 2017-05-26 16:10:25 +00:00
Felipe Leme
2b0181a16a Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev am: 25ae29dfd5
am: 7dca2f6c74

Change-Id: Id3c55fac5286f9c77d09698711ca9467a3c43bae
2017-05-26 15:21:21 +00:00
Felipe Leme
7dca2f6c74 Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
am: 25ae29dfd5

Change-Id: If14315daa807243828d0c386638fad38811d99e0
2017-05-26 15:15:50 +00:00
TreeHugger Robot
25ae29dfd5 Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev 2017-05-26 15:08:20 +00:00
Julia Reynolds
17a136f69c Merge "Allow some system notifications to be blocked." into oc-dev am: 3a2ac3e11b
am: a98bdea2c5

Change-Id: Iec706994f0c7af34ba38b01fffaccdf6ee1bbe84
2017-05-26 15:02:28 +00:00
Julia Reynolds
a98bdea2c5 Merge "Allow some system notifications to be blocked." into oc-dev
am: 3a2ac3e11b

Change-Id: I356dcf376002d95238509235389d260e179fea26
2017-05-26 14:53:53 +00:00
Julia Reynolds
3a2ac3e11b Merge "Allow some system notifications to be blocked." into oc-dev 2017-05-26 14:39:30 +00:00
Tony Mak
4128499373 Merge "Remove the old version of setAffiliationIds" into oc-dev am: 8d902a9e28
am: 754f6e22b0

Change-Id: I95a4b13ed76b6ce38c50047c9c6c923bf2ef7778
2017-05-26 13:12:48 +00:00
Tony Mak
754f6e22b0 Merge "Remove the old version of setAffiliationIds" into oc-dev
am: 8d902a9e28

Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
2017-05-26 13:06:23 +00:00
TreeHugger Robot
8d902a9e28 Merge "Remove the old version of setAffiliationIds" into oc-dev 2017-05-26 13:00:40 +00:00