Tianjie Xu
0939ddf6f3
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708 am: 3aeade44a9
...
am: 96ce9d16ed
2016-09-28 20:10:46 +00:00
Tianjie Xu
96ce9d16ed
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708
...
am: 3aeade44a9
2016-09-28 20:05:15 +00:00
TreeHugger Robot
20cd781754
Merge "Clarify the behavior of UsbRequest"
2016-09-28 20:02:34 +00:00
Tianjie Xu
3aeade44a9
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2
...
am: c68e6d6708
2016-09-28 19:59:12 +00:00
Tianjie Xu
c68e6d6708
Merge "Log the error when uncrypt timeouts"
...
am: c1973ecbd2
2016-09-28 19:53:37 +00:00
Treehugger Robot
c1973ecbd2
Merge "Log the error when uncrypt timeouts"
2016-09-28 19:42:29 +00:00
Philip P. Moltmann
5dd4e6cf74
Clarify the behavior of UsbRequest
...
This is obviously just about describing a bad behavior. In the next step
these methods should be deprecated and replaced with versions that deal
with ByteBuffers appropriately.
Bug: 31050148
Test: Test that enshrines the documented behavior is submitted alongside
this change
Change-Id: If250a8bbd636784355e839a1638d52f3bbe9b83d
2016-09-28 11:29:02 -07:00
Andreas Huber
9105ca5559
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac am: 2849ee8b75 am: 0f7eb16fad
...
am: d321db4481
2016-09-28 17:47:48 +00:00
Andreas Huber
d321db4481
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac am: 2849ee8b75
...
am: 0f7eb16fad
2016-09-28 17:42:02 +00:00
Andreas Huber
0f7eb16fad
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac
...
am: 2849ee8b75
2016-09-28 17:36:31 +00:00
Andreas Huber
2849ee8b75
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
...
am: 90acbd86ac
2016-09-28 17:30:23 +00:00
TreeHugger Robot
bf2e4a3855
Merge "Set the Intent class loader for onActivityReenter."
2016-09-28 17:13:32 +00:00
Jeremy Klein
70a220be4f
Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4 am: 140e5cce70
...
am: 8002b27512
2016-09-28 15:50:05 +00:00
Jeremy Klein
8002b27512
Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4
...
am: 140e5cce70
2016-09-28 15:44:23 +00:00
Jeremy Klein
140e5cce70
Remove unused mContext from BluetoothGatt[Server].
...
am: adc26ec1b4
2016-09-28 15:38:46 +00:00
TreeHugger Robot
0820881132
Merge "Remove android.net.PskKeyManager"
2016-09-28 08:09:37 +00:00
Jeremy Klein
adc26ec1b4
Remove unused mContext from BluetoothGatt[Server].
...
All that this member variable is doing right now is leaking a
reference to a context without any benefit.
Bug: 31752040
Bug: 31710795
Change-Id: If2241422533318b866340e8dcc9f5fbd9518349c
2016-09-28 07:09:38 +00:00
Salvador Martinez
3b41285a0c
Changed themes for core activities am: 7e2657c303 am: f3209d6c87
...
am: 32a87ca7a9
2016-09-28 00:22:59 +00:00
Salvador Martinez
32a87ca7a9
Changed themes for core activities am: 7e2657c303
...
am: f3209d6c87
2016-09-28 00:16:50 +00:00
Greg Kaiser
5abcc9a888
ContextHubService: Hack around 32-bit app ID am: 1983f9b05b am: 40c0435026
...
am: eaed84e40a
2016-09-28 00:11:46 +00:00
Salvador Martinez
f3209d6c87
Changed themes for core activities
...
am: 7e2657c303
2016-09-28 00:08:55 +00:00
Christopher Tate
f11313f763
Don't leak wakelock instances am: 4b17e984b6 am: cea6cc9d33
...
am: 5f00f298bf
2016-09-28 00:06:50 +00:00
TreeHugger Robot
c43f05e669
Merge "Changed themes for core activities" into nyc-mr1-dev
2016-09-28 00:04:00 +00:00
Greg Kaiser
eaed84e40a
ContextHubService: Hack around 32-bit app ID am: 1983f9b05b
...
am: 40c0435026
2016-09-27 23:54:37 +00:00
Christopher Tate
5f00f298bf
Don't leak wakelock instances am: 4b17e984b6
...
am: cea6cc9d33
2016-09-27 23:50:20 +00:00
Greg Kaiser
40c0435026
ContextHubService: Hack around 32-bit app ID
...
am: 1983f9b05b
2016-09-27 23:46:08 +00:00
Christopher Tate
cea6cc9d33
Don't leak wakelock instances
...
am: 4b17e984b6
2016-09-27 23:44:51 +00:00
Greg Kaiser
a97c9617ae
Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev
2016-09-27 23:41:44 +00:00
TreeHugger Robot
121a9941d4
Merge "Don't leak wakelock instances" into nyc-mr1-dev
2016-09-27 23:37:57 +00:00
George Mount
88f6bc82f9
Set the Intent class loader for onActivityReenter.
...
Bug 29992842
This is the same thing we do in ActivityThread#deliverResults
before calling Activity#dispatchActivityResult.
Test: Ic5510f1b3c3c453ca9035b167ce5379e9023be20
Change-Id: I3bb94572f13d8c9a7537dfa51e436702c00f5701
2016-09-27 15:37:59 -07:00
Greg Kaiser
1983f9b05b
ContextHubService: Hack around 32-bit app ID
...
The NanoApp.java class has a bug (b/30808791) where the API treats
app IDs as 32-bits, instead of 64-bits. We are too late in the
Android N release cycle to change this API.
We previously put in a hack to fix this only for Google nanoapps.
However, our GTS nanoapps need this to work, and there are other
partners who need this to work in the N timeframe. So we make
a more robust hack which parses the full 64-bit app ID out of
the header binary.
Test: Compiles and runs GTS
Bug: 31767599
Change-Id: Ic43f1f62c685fb99aac08d08767d1a67c329503f
2016-09-27 15:01:48 -07:00
Christopher Tate
4b17e984b6
Don't leak wakelock instances
...
Bug 31247436
Change-Id: I7c2ad956c43233b37e53856e9321cb87b01c35da
2016-09-27 15:00:48 -07:00
Svet Ganov
9d56963630
[DO NOT MERGE] Use tokens instead of account access trackers am: 32bfb594af
...
am: 18b725ac0a
2016-09-27 20:59:00 +00:00
Svet Ganov
18b725ac0a
[DO NOT MERGE] Use tokens instead of account access trackers
...
am: 32bfb594af
2016-09-27 20:51:28 +00:00
TreeHugger Robot
5c07d0c2ee
Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev
2016-09-27 20:45:48 +00:00
Tianjie Xu
036d08638e
Log the error when uncrypt timeouts
...
Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.
Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b
2016-09-27 13:34:58 -07:00
Alex Klyubin
5e86d951a7
Remove android.net.PskKeyManager
...
android.net.PskKeyManager does not work with upcoming TLS 1.3.
The class does not appear to be used by any Android apps and is thus
likely to be completely removed in the future.
Bug: 30978706
Test: make && make cts
Change-Id: Id9bae20362c5909e4621cdb00102bfee09d970ec
2016-09-27 11:24:32 -07:00
Andreas Huber
906a679aa8
Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)
...
that convert a one-dimensional array of scalars into the corresponding
one-dimensional array of the associated "wrapped" type, i.e. byte[] -> Byte[].
Change-Id: I712b2bb5330bd660816d0ff536a55913904203b6
Bug: 31682327
Test: hidl_test_java
2016-09-27 11:20:44 -07:00
Doris Liu
2d7cb10ea4
Allow null target in ObjectAnimator if the target has never been set am: 4d04b1a446 am: fd2c4f186b
...
am: 07c6140cda
2016-09-27 07:29:03 +00:00
Kevin Hufnagle
00fb451646
docs: Added min/max values and descriptions for alpha getter/setter in ImageView am: bdb308a059 am: 3b0cfd76c2
...
am: 6d53bf091c
2016-09-27 06:54:27 +00:00
Kevin Hufnagle
9c3cbe634c
docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a am: ba65a92855
...
am: cf7a2e1efd
2016-09-27 06:50:25 +00:00
Kevin Hufnagle
e49b2ac9ee
docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3 am: e0360165d3
...
am: ffafee82cd
2016-09-27 06:46:02 +00:00
Kevin Hufnagle
930012063b
docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap am: 5232329b4e am: 1456a0a321
...
am: 4cb055832b
2016-09-27 02:11:31 +00:00
Kevin Hufnagle
7f3010a6cd
docs: Clarified definition of KeyEvent.Callback.onKeyMultiple() am: b248b1f689 am: f3f234ff36
...
am: 88af737268
2016-09-27 02:02:57 +00:00
Kevin Hufnagle
5b4664b2de
docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b am: 108623004f
...
am: 978be65ce7
2016-09-27 01:18:42 +00:00
Kevin Hufnagle
9dc7f07f26
docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59 am: 1fb3dec4be
...
am: 5ca3c61069
2016-09-27 01:04:33 +00:00
Chien-Yu Chen
62d6962835
Camera2: Support early finished tasks am: dd6629ef86 am: 8425ebc28f
...
am: e98ffa404e
2016-09-27 00:55:42 +00:00
Doris Liu
07c6140cda
Allow null target in ObjectAnimator if the target has never been set am: 4d04b1a446
...
am: fd2c4f186b
2016-09-27 00:52:18 +00:00
Doris Liu
fd2c4f186b
Allow null target in ObjectAnimator if the target has never been set
...
am: 4d04b1a446
2016-09-27 00:43:23 +00:00
TreeHugger Robot
f574ba6eed
Merge "Allow null target in ObjectAnimator if the target has never been set" into nyc-mr1-dev
2016-09-27 00:38:05 +00:00
