Commit Graph

71174 Commits

Author SHA1 Message Date
Robert Carr
8a967672d5 Merge changes I5762a98d,I39f4e015 into oc-dev
am: c56b1d3c98

Change-Id: I4e6931609d4a3fc8a0c80b58f9d279f1f65d6a10
2017-05-30 21:39:09 +00:00
TreeHugger Robot
c56b1d3c98 Merge changes I5762a98d,I39f4e015 into oc-dev
* changes:
  ViewRootImpl: More careful draw accounting.
  SurfaceView: Avoid over-reporting DRAW_FINISHED.
2017-05-30 21:33:31 +00:00
Dianne Hackborn
4d476366be Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev
am: 1399d3abf5

Change-Id: I49169ce6f6559d9bfad36693b1582b2d810380b6
2017-05-30 20:31:33 +00:00
Dianne Hackborn
1399d3abf5 Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev 2017-05-30 20:21:17 +00:00
Peter Qiu
421018f44b Merge changes from topic 'hide_passpoint_r2' into oc-dev
am: 4bd47fce86

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
2017-05-30 18:55:37 +00:00
TreeHugger Robot
4bd47fce86 Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
2017-05-30 18:47:12 +00:00
Dianne Hackborn
ccc63ec80f Work on issue #62095840: NPE in JobParamteres in the background
Crash early if an app calls jobFinished() with null params.

Test: manual

Change-Id: Icc2cf241edaad00bc5bd49d07a431627bbd76524
2017-05-30 11:04:53 -07:00
Julia Reynolds
393efb57d7 Merge "Suppress HUNs according to group alert behavior" into oc-dev
am: 8bc45cb78f

Change-Id: I86f65c9f8ae331d5b3cc4a35af6a48aa2b04dce1
2017-05-30 16:49:52 +00:00
Renat Aksitov
931983d607 Voice Messaging Intent API.
Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.

Bug 37747843

Test: make -j11 docs

Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9
(cherry picked from commit 2c4201448e)
2017-05-30 09:47:42 -07:00
Julia Reynolds
8bc45cb78f Merge "Suppress HUNs according to group alert behavior" into oc-dev 2017-05-30 16:43:39 +00:00
Robert Carr
49cd9f882c ViewRootImpl: More careful draw accounting.
The strategy of beginning the count at 1 isn't enough
and we need to explicitly debt each request to report
draw. Imagine the case where a ViewRootImpl reports draw
multiple times, while we are waiting for a SurfaceView draw
completion callback. Without the explicit draw debt, the ViewRoot
would be counted as drawing for the SurfaceView and we could
notify the WM too early.

Test: Open Chrome a few hundred times. go/wm-smoke.
Bug: 38324871
Change-Id: I5762a98d1cc808125033ba3d1db8a3ea39a9e071
2017-05-30 09:27:44 -07:00
Robert Carr
b53670aecf SurfaceView: Avoid over-reporting DRAW_FINISHED.
To some extent we rely on the app to call the draw callback
if they want the app to work properly, but this case is fairly easy
to detect, so why not prevent it and provide a helpful log.

Bug: 62051758
Test: Warm start camera a few times. go/wm-smoke.
Change-Id: I39f4e015bfa15a1e0c37dba70b4a700803a6a274
2017-05-30 09:27:44 -07:00
Rob Carr
0fc7ca44e8 Merge "Fix SurfaceView handler." into oc-dev
am: 5366cfbef3

Change-Id: I29980e5255957c1830a72707bb20c2de128d76ac
2017-05-30 16:23:49 +00:00
Rob Carr
5366cfbef3 Merge "Fix SurfaceView handler." into oc-dev 2017-05-30 16:17:32 +00:00
Felipe Leme
fdd1fd3264 Merge "Improved autofillHints documentation." into oc-dev
am: 0b1b1c4346

Change-Id: I2aeaefde853f941263fcf677dfdcb3bffc6ab337
2017-05-27 02:30:30 +00:00
TreeHugger Robot
0b1b1c4346 Merge "Improved autofillHints documentation." into oc-dev 2017-05-27 02:25:08 +00:00
TreeHugger Robot
e2b92e904c Merge "Add 32 and 128 bit Service Data parsing." into oc-dev 2017-05-27 01:28:03 +00:00
Siyamed Sinir
6a95c58508 Merge "Dont try to autoSize if TextView is not measured" into oc-dev
am: 42b2760525

Change-Id: I737e9498b08de1a8447db39b194fe1640c721f2d
2017-05-27 00:27:58 +00:00
Jiaquan He
778523ca5c Merge changes from topic 'highlight_fixed' into oc-dev
am: 759669988b

Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c
2017-05-27 00:20:56 +00:00
Jiaquan He
74282f0745 Check state_focus in foreground.
am: 0bdf1c9c76

Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
2017-05-27 00:19:35 +00:00
Siyamed Sinir
42b2760525 Merge "Don’t try to autoSize if TextView is not measured" into oc-dev 2017-05-27 00:13:39 +00:00
TreeHugger Robot
759669988b Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
  Check default focus highlight for ImageView.
  Check state_focus in foreground.
2017-05-27 00:11:10 +00:00
Jakub Pawlowski
50f8f3db27 Add 32 and 128 bit Service Data parsing.
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
(cherry picked from commit 45033a7e57)
2017-05-26 16:24:40 -07:00
Jakub Pawlowski
bf79e36f57 Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
am: 138f75bbc8

Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa
2017-05-26 23:14:27 +00:00
Jakub Pawlowski
138f75bbc8 Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd

Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28
2017-05-26 23:09:23 +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

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
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
Jiaquan He
1dd48d0b8f Check default focus highlight for ImageView.
This commit specially checks isDefaultFocusHighlightNeeded for
ImageView. We should also check with the content drawable of the
ImageView besides its foreground or background.

Bug: 62141891
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded

Change-Id: Iaf12a5863d7760d9361d0196a46de07a9ccda74e
2017-05-26 14:31:29 -07:00
John Reck
7992500d54 Fix SurfaceView handler.
The UI Thread is whatever we happen to be attached to, or the current thread if we are unattached.

Bug: 38180075
Test: Repro from bug. go/wm-smoke.
Change-Id: I3f75882aa13de2b781c71ebbc7b09888981521b3
2017-05-26 21:15:33 +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
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
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
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
Julia Reynolds
30203159f9 Suppress HUNs according to group alert behavior
Test: runtest systemui, systemui-notification
Change-Id: I9f987bc0ba22f2d48b02585fd722880bb5c2a9b5
Fixes: 62126386
2017-05-26 20:35:07 +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
Siyamed Sinir
cfc79a9e5f Don’t try to autoSize if TextView is not measured
This CL early returns from auto sizing text if the view is not measured
yet.

Test: run cts --test android.widget.cts.TextViewTest -m CtsWidgetTestCases
Test: Added cts.TextViewTest#testAutosizeWithMaxLines_shouldNotThrowException
Test: Manual test with sample app for the failing case.

Bug: 38440435
Change-Id: Ic03c991f33a2b7701623f00f44cba7fb6cdfce46
2017-05-26 12:00:51 -07: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