OSDN Git Service

android-x86/frameworks-base.git
7 years agoCheck state_focus in foreground. am: 0bdf1c9c76
Jiaquan He [Tue, 30 May 2017 13:34:35 +0000 (13:34 +0000)]
Check state_focus in foreground. am: 0bdf1c9c76
am: 74282f0745

Change-Id: I6266996179177f5812a82537510bf58e5c3f6b0d

7 years agoMerge "Fixed a bug where min-priority were in the middle" into oc-dev am: 7ddf54211f
Selim Cinek [Tue, 30 May 2017 13:30:59 +0000 (13:30 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev am: 7ddf54211f
am: 613ac93620

Change-Id: If2740716c8e5093176a839f880d8681109e63356

7 years agoMerge "Refresh screen off timeout when screen lock is released in VR" into oc-dev...
Andrii Kulian [Tue, 30 May 2017 13:28:29 +0000 (13:28 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev am: e63965cef5
am: 83876c735e

Change-Id: I843e2469694c31ee23148ae09cb7b9c5d7506bfc

7 years agoMerge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am...
Jakub Pawlowski [Tue, 30 May 2017 13:26:19 +0000 (13:26 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp am: 658e1ddc7e" into oc-dev-plus-aosp
am: 8546ca67da

Change-Id: Ice5353450b11baef89c1bdd34ac44e8644139b86

7 years agoMerge "Fix the back button ripple." into oc-dev am: a7914f24dd
Jiaquan He [Tue, 30 May 2017 13:23:52 +0000 (13:23 +0000)]
Merge "Fix the back button ripple." into oc-dev am: a7914f24dd
am: 665d86a0fa

Change-Id: I27e94ab8e43fec9339cac03b49738069c1dbe206

7 years agoMerge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd am...
Jakub Pawlowski [Tue, 30 May 2017 13:21:37 +0000 (13:21 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd am: 138f75bbc8
am: bf79e36f57

Change-Id: I76b80aa77fa77fa66597fb94dcd8fef703a4f1ff

7 years agoMerge "Add ID_LENGTH field for Empty type record" into oc-dev am: bb63b4a376
Yuka Anami [Tue, 30 May 2017 13:19:20 +0000 (13:19 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev am: bb63b4a376
am: 0c7e85da54

Change-Id: Ieee8273e8a32b15e060be4ffd835f4a964c4b5ac

7 years agoMerge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781 am: 3377e1fc91
Ruchi Kandoi [Tue, 30 May 2017 13:17:11 +0000 (13:17 +0000)]
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781 am: 3377e1fc91
am: cd9d36f665

Change-Id: Ia7d3be56ce538cbb40c72673b8c2824d0a76b82b

7 years agoMerge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314 am...
Yuka Anami [Tue, 30 May 2017 13:14:44 +0000 (13:14 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314 am: 269cb38bb9
am: 50b8697071

Change-Id: I9fea9b4a931d334af711fa8e102594fb24f350fa

7 years agoMerge "Don't show ripple effect on the element replacing "See All"" into oc-dev am...
Sergey Vasilinets [Tue, 30 May 2017 13:11:47 +0000 (13:11 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev am: bacaffa497
am: 6190ec9b03

Change-Id: I7287ab2c8e765620df72326383e9361e1561478b

7 years agoMerge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permissi...
Julius D'souza [Tue, 30 May 2017 13:09:33 +0000 (13:09 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev am: f4abac4d8f  -s ours
am: d9251bad5b  -s ours

Change-Id: Ia059d6a9eb146abedd2f05953c79362b457eab97

7 years agoAdd WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission...
Julius D'souza [Tue, 30 May 2017 13:01:08 +0000 (13:01 +0000)]
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission. am: b9a71dfd38  -s ours
am: eac7a439d0  -s ours

Change-Id: I75acd2db31e9bfd3297326800374858443743a35

7 years agoMerge "Properly read vibration setting on boot." into oc-dev am: 2c324042df
Julia Reynolds [Tue, 30 May 2017 12:55:09 +0000 (12:55 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev am: 2c324042df
am: f9d4e9428b

Change-Id: Ia55bfa05ebcf97262d9725028d67d3de5a4f33e5

7 years agoMerge "Disable autofill while user setup is not completed." into oc-dev am: 3540463b74
Felipe Leme [Tue, 30 May 2017 12:50:44 +0000 (12:50 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev am: 3540463b74
am: d51bf85e6c

Change-Id: I5a55fa8fbedfdeb3721a9b0c1e0c24c3602f2bfd

7 years agoMerge "Use uptime instead of elapsed for measuring duration" into oc-dev am: 22c2be0fbc
Amith Yamasani [Tue, 30 May 2017 12:41:10 +0000 (12:41 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev am: 22c2be0fbc
am: 85e6dd985b

Change-Id: I1c6e773427438e0474ca44ba49dddfcafdaea3da

7 years agoMerge "Resolve inflate attr against default package" into oc-dev am: bd8fb0e71d
Alan Viverette [Tue, 30 May 2017 12:35:32 +0000 (12:35 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev am: bd8fb0e71d
am: 9c0108304c

Change-Id: Icbf1a40dee9adc71785f21d8d4ba0b3f78c3e3ed

7 years agoMerge "Fix QS Detail header touch target" into oc-dev am: b25f52c042
Jason Monk [Tue, 30 May 2017 12:32:51 +0000 (12:32 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev am: b25f52c042
am: d58b721e55

Change-Id: I56b59ebb4d6c8c70fa1b9bf8810f921045c88d83

7 years agoMerge "Fixed broken ImageFloatingTextViewTests" into oc-dev am: 76926df97e
Selim Cinek [Tue, 30 May 2017 12:29:13 +0000 (12:29 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev am: 76926df97e
am: f802c625ca

Change-Id: I281d04089f5ef83e22d0c15a25bacbc5dd1e4b34

7 years agoMerge "resolve merge conflicts of daeafccfa962 to master"
Benoit Lamarche [Tue, 30 May 2017 12:25:57 +0000 (12:25 +0000)]
Merge "resolve merge conflicts of daeafccfa962 to master"

7 years agoresolve merge conflicts of daeafccfa962 to master
Jason Monk [Fri, 26 May 2017 19:20:20 +0000 (15:20 -0400)]
resolve merge conflicts of daeafccfa962 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39

7 years agoMerge "Scrim opacity varies based on notification count"
TreeHugger Robot [Sat, 27 May 2017 01:36:49 +0000 (01:36 +0000)]
Merge "Scrim opacity varies based on notification count"

7 years agoMerge "Avoid locking in getCurrentUser when there is no user switch"
TreeHugger Robot [Sat, 27 May 2017 01:23:13 +0000 (01:23 +0000)]
Merge "Avoid locking in getCurrentUser when there is no user switch"

7 years agoCheck state_focus in foreground.
Jiaquan He [Sat, 27 May 2017 00:19:35 +0000 (00:19 +0000)]
Check state_focus in foreground.
am: 0bdf1c9c76

Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53

7 years agoMerge "Some service tests are missing size annotations"
Makoto Onuki [Fri, 26 May 2017 23:39:56 +0000 (23:39 +0000)]
Merge "Some service tests are missing size annotations"

7 years agoScrim opacity varies based on notification count
Lucas Dupin [Thu, 25 May 2017 00:04:47 +0000 (17:04 -0700)]
Scrim opacity varies based on notification count

Test: visual
Bug: 62068907
Change-Id: I7055f47443bf6520e42c00797d5c76108a824465

7 years agoMerge "Fixed a bug where min-priority were in the middle" into oc-dev
Selim Cinek [Fri, 26 May 2017 23:38:48 +0000 (23:38 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am: 7ddf54211f

Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068

7 years agoMerge "Fixed a bug where min-priority were in the middle" into oc-dev
Selim Cinek [Fri, 26 May 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev

7 years agoMerge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
Andrii Kulian [Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am: e63965cef5

Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0

7 years agoMerge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am...
Android Build Merger (Role) [Fri, 26 May 2017 23:22:11 +0000 (23:22 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp am: 658e1ddc7e" into oc-dev-plus-aosp

7 years agoMerge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd...
Jakub Pawlowski [Fri, 26 May 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
am: 658e1ddc7e

Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6

7 years agoMerge "Fix the back button ripple." into oc-dev
Jiaquan He [Fri, 26 May 2017 23:19:16 +0000 (23:19 +0000)]
Merge "Fix the back button ripple." into oc-dev
am: a7914f24dd

Change-Id: I35e474ed44380821278009945529474b6251c23b

7 years agoMerge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd...
Android Build Merger (Role) [Fri, 26 May 2017 23:17:28 +0000 (23:17 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
Jakub Pawlowski [Fri, 26 May 2017 23:16:35 +0000 (23:16 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd

Change-Id: I3fe5c7c0baf273c9960a56640cd659abd990b858

7 years agoMerge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
Andrii Kulian [Fri, 26 May 2017 23:15:14 +0000 (23:15 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev

7 years agoMerge "Stop populating accessibility nodes with events"
Phil Weaver [Fri, 26 May 2017 23:14:55 +0000 (23:14 +0000)]
Merge "Stop populating accessibility nodes with events"

7 years agoMerge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
Jakub Pawlowski [Fri, 26 May 2017 23:14:27 +0000 (23:14 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
am: 138f75bbc8

Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa

7 years agoMerge "Fix the back button ripple." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 23:10:44 +0000 (23:10 +0000)]
Merge "Fix the back button ripple." into oc-dev

7 years agoMerge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
Jakub Pawlowski [Fri, 26 May 2017 23:09:23 +0000 (23:09 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd

Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28

7 years agoMerge "Add 32 and 128 bit Service Data parsing."
Jakub Pawlowski [Fri, 26 May 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
am: 725e212de3

Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56

7 years agoMerge "Add ID_LENGTH field for Empty type record" into oc-dev
Yuka Anami [Fri, 26 May 2017 22:58:49 +0000 (22:58 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
am: bb63b4a376

Change-Id: I923cb6ed3b459f092a24211f7e18076d248ae615

7 years agoMerge "Add 32 and 128 bit Service Data parsing."
Treehugger Robot [Fri, 26 May 2017 22:53:27 +0000 (22:53 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."

7 years agoMerge "Add ID_LENGTH field for Empty type record" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 22:51:55 +0000 (22:51 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev

7 years agoMerge "Allow ManagedProvisioning to silently uninstall apps"
Sudheer Shanka [Fri, 26 May 2017 22:47:51 +0000 (22:47 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"

7 years agoMerge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781
Ruchi Kandoi [Fri, 26 May 2017 22:45:24 +0000 (22:45 +0000)]
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781
am: 3377e1fc91

Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359

7 years agoMerge "Make NFC AIDL callbacks oneway" am: 99c805b319
Ruchi Kandoi [Fri, 26 May 2017 22:37:26 +0000 (22:37 +0000)]
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319
am: a50b393781

Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6

7 years agoMerge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314
Yuka Anami [Fri, 26 May 2017 22:30:19 +0000 (22:30 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314
am: 269cb38bb9

Change-Id: I8bf7940e14a0f2177ff46ef91575922b48716351

7 years agoMerge "Make NFC AIDL callbacks oneway"
Ruchi Kandoi [Fri, 26 May 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Make NFC AIDL callbacks oneway"
am: 99c805b319

Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189

7 years agoMerge "@IntDef and @StringDef must have source retention"
Tor Norbye [Fri, 26 May 2017 22:25:55 +0000 (22:25 +0000)]
Merge "@IntDef and @StringDef must have source retention"

7 years agoMerge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83
Yuka Anami [Fri, 26 May 2017 22:23:53 +0000 (22:23 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83
am: 0d9dfc4314

Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f

7 years agoMerge "Make NFC AIDL callbacks oneway"
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"

7 years agoMerge "Add ID_LENGTH field for Empty type record"
Yuka Anami [Fri, 26 May 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
am: b1f0bb6f83

Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59

7 years agoMerge "Don't show ripple effect on the element replacing "See All"" into oc-dev
Sergey Vasilinets [Fri, 26 May 2017 22:16:00 +0000 (22:16 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
am: bacaffa497

Change-Id: I7306408f2de87edc16d091713eba777a8e58b0ac

7 years agoMerge "Don't show ripple effect on the element replacing "See All"" into oc-dev
Sergey Vasilinets [Fri, 26 May 2017 22:11:22 +0000 (22:11 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev

7 years agoMerge "Add ID_LENGTH field for Empty type record"
Treehugger Robot [Fri, 26 May 2017 22:07:37 +0000 (22:07 +0000)]
Merge "Add ID_LENGTH field for Empty type record"

7 years agoMerge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permissi...
Julius D'souza [Fri, 26 May 2017 22:05:44 +0000 (22:05 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
am: f4abac4d8f  -s ours

Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0

7 years agoAdd WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission.
Julius D'souza [Fri, 26 May 2017 22:00:41 +0000 (22:00 +0000)]
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission.
am: b9a71dfd38  -s ours

Change-Id: I9070e593929924f3feae92e08980549ba755036b

7 years agoMerge "Properly read vibration setting on boot." into oc-dev
Julia Reynolds [Fri, 26 May 2017 21:52:17 +0000 (21:52 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev
am: 2c324042df

Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c

7 years agoMerge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permissi...
TreeHugger Robot [Fri, 26 May 2017 21:48:48 +0000 (21:48 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev

7 years agoMerge "Properly read vibration setting on boot." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 21:43:24 +0000 (21:43 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev

7 years agoMerge "Disable autofill while user setup is not completed." into oc-dev
Felipe Leme [Fri, 26 May 2017 21:35:41 +0000 (21:35 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev
am: 3540463b74

Change-Id: I0a95d3c79a16240d00a8684341d00c9b76927fbf

7 years agoMerge "Disable autofill while user setup is not completed." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 21:29:41 +0000 (21:29 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev

7 years agoFix the back button ripple.
Jiaquan He [Wed, 24 May 2017 23:00:10 +0000 (16:00 -0700)]
Fix the back button ripple.

Bug: 62141426
Test: Manually checked that the default highlight doesn't show up
when tapping on the back button on the navigation bar.
Change-Id: Iedef32077c869e55f14dbd0aa92c4ce3220e0d1a

7 years agoMerge "Revert "Make synthetic password enabled by default""
TreeHugger Robot [Fri, 26 May 2017 21:14:22 +0000 (21:14 +0000)]
Merge "Revert "Make synthetic password enabled by default""

7 years agoMerge "Misc logging constants for Settings"
TreeHugger Robot [Fri, 26 May 2017 21:11:32 +0000 (21:11 +0000)]
Merge "Misc logging constants for Settings"

7 years agoAdd 32 and 128 bit Service Data parsing.
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.

Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd

7 years agoMerge "Use uptime instead of elapsed for measuring duration" into oc-dev
Amith Yamasani [Fri, 26 May 2017 21:10:40 +0000 (21:10 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
am: 22c2be0fbc

Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d

7 years agoMake NFC AIDL callbacks oneway
Ruchi Kandoi [Fri, 28 Apr 2017 22:48:02 +0000 (15:48 -0700)]
Make NFC AIDL callbacks oneway

Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
7 years agoMerge "Resolve inflate attr against default package" into oc-dev
Alan Viverette [Fri, 26 May 2017 21:03:07 +0000 (21:03 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev
am: bd8fb0e71d

Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21

7 years agoMerge "Use uptime instead of elapsed for measuring duration" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 20:56:05 +0000 (20:56 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev

7 years agoMerge "Resolve inflate attr against default package" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 20:54:49 +0000 (20:54 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev

7 years agoAdd ID_LENGTH field for Empty type record
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
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)

7 years agoAdd ID_LENGTH field for Empty type record
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
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

7 years agoMerge "Fix QS Detail header touch target" into oc-dev
Jason Monk [Fri, 26 May 2017 20:52:10 +0000 (20:52 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev
am: b25f52c042

Change-Id: I7ec755fdfda3014aecdcfa7ff47ae0c39d3bff92

7 years agoMerge "Fix QS Detail header touch target" into oc-dev
Jason Monk [Fri, 26 May 2017 20:44:10 +0000 (20:44 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev

7 years agoProperly read vibration setting on boot.
Julia Reynolds [Fri, 26 May 2017 18:43:47 +0000 (14:43 -0400)]
Properly read vibration setting on boot.

Test: runtest systemui-notification
Change-Id: I400bc3df441524abe4973d4d6bccc7ef30a2e1c7
Fixes: 37865035

7 years agoMerge "Add a way to clear cached provider for tests in Settings class."
TreeHugger Robot [Fri, 26 May 2017 20:29:19 +0000 (20:29 +0000)]
Merge "Add a way to clear cached provider for tests in Settings class."

7 years agoMerge "Blacklist some color ranges in palette generation"
TreeHugger Robot [Fri, 26 May 2017 20:18:17 +0000 (20:18 +0000)]
Merge "Blacklist some color ranges in palette generation"

7 years agoMerge "Add setting to indicate whether the eUICC is provisioned."
Qingxi Li [Fri, 26 May 2017 20:05:33 +0000 (20:05 +0000)]
Merge "Add setting to indicate whether the eUICC is provisioned."

7 years agoMerge "Fixed broken ImageFloatingTextViewTests" into oc-dev
Selim Cinek [Fri, 26 May 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
am: 76926df97e

Change-Id: I7183050c98b5f1eb9f8a8a7dbfe4b7b75a1c3be7

7 years agoMerge "Fixed broken ImageFloatingTextViewTests" into oc-dev
Selim Cinek [Fri, 26 May 2017 19:45:00 +0000 (19:45 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev

7 years agoRevert "Make synthetic password enabled by default"
Paul Crowley [Fri, 26 May 2017 19:14:35 +0000 (19:14 +0000)]
Revert "Make synthetic password enabled by default"

This reverts commit 4d36be3f1d157dccbdd373d76e9af30cc84ce781.

Change-Id: Ic4615a30f4460541049de7175ad84db1d1fc8a86

7 years agoMerge "Moar Autofill Framework javadoc improvements:" into oc-dev am: 7990306b8b
Felipe Leme [Fri, 26 May 2017 19:12:33 +0000 (19:12 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev am: 7990306b8b
am: fa2d7ffb95

Change-Id: I4734f1b5abbdf907692006355c2a60d13549819b

7 years agoMerge "Make volume dialog pick up on theme changes" into oc-dev
Jason Monk [Fri, 26 May 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev
am: 1ec5d85a41

Change-Id: I9b2e6dbe789bb6e1ff113e5ad015813e1062c6b4

7 years agoMerge "Moar Autofill Framework javadoc improvements:" into oc-dev
Felipe Leme [Fri, 26 May 2017 19:06:25 +0000 (19:06 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
am: 7990306b8b

Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8

7 years agoMerge "Make volume dialog pick up on theme changes" into oc-dev
Jason Monk [Fri, 26 May 2017 19:03:39 +0000 (19:03 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev

7 years agoMerge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a
Adam Lesinski [Fri, 26 May 2017 19:01:00 +0000 (19:01 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a
am: 01b95f9067

Change-Id: I7097af67601496f56741a5f5e43f953ba8134ce0

7 years agoResolve inflate attr against default package
Alan Viverette [Tue, 23 May 2017 15:33:42 +0000 (11:33 -0400)]
Resolve inflate attr against default package

Change-Id: I2de0f79fb4918770c9f816934b1fc4953073a4f1
Fixes: 38456890
Test: LayoutInflaterTest#testInclude

7 years agoMerge "Moar Autofill Framework javadoc improvements:" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 18:55:32 +0000 (18:55 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev

7 years agoMerge "Add ResourceId validation helper method" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:55:15 +0000 (18:55 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev
am: 24c18af14a

Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294

7 years agoMerge "AAPT2: Implement attribute compat versioning" into oc-dev am: e229113d46
Adam Lesinski [Fri, 26 May 2017 18:55:01 +0000 (18:55 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev am: e229113d46
am: 138d2a65b3

Change-Id: Ie3502e99aefa46ee9fe62a0e821e55cb160b7142

7 years agoAdd a way to clear cached provider for tests in Settings class.
Sudheer Shanka [Tue, 23 May 2017 22:19:10 +0000 (15:19 -0700)]
Add a way to clear cached provider for tests in Settings class.

Bug: 38437704
Bug: 38433611
Test: manual
Change-Id: Id2803359644bd68a158294b6d801fc9cd316fc9f

7 years agoMerge "AAPT2: Implement attribute compat versioning" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:49:11 +0000 (18:49 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
am: e229113d46

Change-Id: I0200771f675cdfa69c458c374d3c16b0d91c5756

7 years agoMerge "HIDL: C++ Java parity" into oc-dev am: 579110398d -s ours
Steven Moreland [Fri, 26 May 2017 18:45:44 +0000 (18:45 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev am: 579110398d  -s ours
am: e76b15c830  -s ours

Change-Id: I374a2b26f4af22569632c0f9b4341989c097e7a4

7 years agoMerge "Add ResourceId validation helper method" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:45:24 +0000 (18:45 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev

7 years agoMerge "AAPT2: Implement attribute compat versioning" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:42:43 +0000 (18:42 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev

7 years agoMerge "HIDL: C++ Java parity" into oc-dev
Steven Moreland [Fri, 26 May 2017 18:38:09 +0000 (18:38 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev
am: 579110398d  -s ours

Change-Id: I60e19c0d9328bea5e69517e91b47a56e53758ad1

7 years agoMerge "HIDL: C++ Java parity" into oc-dev
Steven Moreland [Fri, 26 May 2017 18:31:53 +0000 (18:31 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev

7 years agoMerge "Make synthetic password enabled by default"
Paul Crowley [Fri, 26 May 2017 18:27:55 +0000 (18:27 +0000)]
Merge "Make synthetic password enabled by default"

7 years agoMerge "Playback activity monitoring: add player types" into oc-dev am: faa2cdfa47
Jean-Michel Trivi [Fri, 26 May 2017 18:19:08 +0000 (18:19 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev am: faa2cdfa47
am: a4f967471b

Change-Id: I598ed9f0ab7f17944b3eea3107bf058a1a99f917

7 years agoDisable autofill while user setup is not completed.
Felipe Leme [Fri, 26 May 2017 16:24:33 +0000 (09:24 -0700)]
Disable autofill while user setup is not completed.

Test: manual verification with experimental app
Test: manual verification with Autofill with Google on flashed deviced
Test: existing CtsAutoFillServiceTestCases pass
Test: new LoginActivityTest.testSetupComplete pass

Fixes: 62049772

Change-Id: I1e914c44062755f8c88656482338e76aeaafd543