Commit Graph

277484 Commits

Author SHA1 Message Date
Vadim Tryshev
f3dba3b5f9 Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev am: e7809891f7
am: 0450961e1f

Change-Id: I0bd6859142918a229f727ae70d4a25b5bd755336
2016-09-28 19:20:00 +00:00
Vadim Tryshev
8fd63c15ad Fixing html glitch in drag/drop docs. am: aed92d0547
am: 0f03709e14

Change-Id: I898d398de7a772c6ada8dd8ee6c702d99d144775
2016-09-28 19:19:10 +00:00
Vadim Tryshev
0450961e1f Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev
am: e7809891f7

Change-Id: I60e7db358928737faa427202a137bd036598bc61
2016-09-28 19:14:07 +00:00
Vadim Tryshev
0f03709e14 Fixing html glitch in drag/drop docs.
am: aed92d0547

Change-Id: I9fe6a7b9544bef4fe4f3ef03f39a3dd59d5cd7ac
2016-09-28 19:14:05 +00:00
TreeHugger Robot
e7809891f7 Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev 2016-09-28 19:07:20 +00:00
Etan Cohen
60add8ad01 [NAN] Remove builder API using String to translate to byte[]
Per API review: String accessor was not needed (duplicate, semantics
not accurate, trivial use-case).

(cherry-pick of commit c76ccf3e7e)

Bug: 31470256
Test: unit tests & integration (sl4a) testing.
Change-Id: Id307702627afd8ee579b540d4c2f65359bf9a925
2016-09-28 11:47:24 -07:00
Vladislav Kuzkokov
bbaadc0166 Fix logic in disabling BackupTransport in DO mode.
We were disabling backup in consumer mode as well.

BUG=31754835
TEST=android.content.pm.cts.shortcuthost.ShortcutManagerBackupTest

Change-Id: I42e5cfa512fda1b471eb62c7eb8bc346383da2fa
2016-09-28 20:24:42 +02:00
Tianjie Xu
2a03586998 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
(cherry picked from commit 036d08638e)
2016-09-28 11:19:03 -07:00
sreevanis
bfc1ba951e docs:Added Wear partner logos.
Bug:31364865
Change-Id: Iab45bd1d058a6fd407d546b69c0368d7a7c69015
2016-09-28 11:16:56 -07:00
Eino-Ville Talvala
ec727411d2 DngCreator: Do not cache timezone in static initializer
The static initializer for a pre-loaded framework class is run
no later than at zygote startup, which happens at device boot.

Which means that if the timezone later changes, DngCreator will use
an incorrect cached timezone until the next reboot.  This is especially
evident in freshly wiped devices, where initial setup will typically
change the timezone.

Instead, read the timezone each time DngCreator is created, which is
also when we query the current time for constructing the timestamps.

Test: android.hardware.camera2.cts.DngCreatorTest#testSingleImageThumbnail
Bug: 31743060
Change-Id: I83a4eac762650e5f904f3b8fa779c094cef30562
2016-09-28 11:10:00 -07:00
Neil Fuller
38188d48dd Merge "Rerun of update-api with no changes" am: f0aa998233 am: 9c0412b7ca
am: 6b32f3801f

Change-Id: I54659875aee7e989caf4adcef47817f1e0a43ebe
2016-09-28 18:02:04 +00:00
Neil Fuller
6b32f3801f Merge "Rerun of update-api with no changes" am: f0aa998233
am: 9c0412b7ca

Change-Id: Icb3cd23aed57e3d0c2191f65d9d2298c5b4df006
2016-09-28 17:55:30 +00:00
Neil Fuller
9c0412b7ca Merge "Rerun of update-api with no changes"
am: f0aa998233

Change-Id: I23a36931c027b29f740879e46d1c28e53b616d71
2016-09-28 17:50:44 +00:00
Andreas Huber
d321db4481 Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac am: 2849ee8b75
am: 0f7eb16fad

Change-Id: I43c563eaba14573e94ced381791eb6ba787d3e51
2016-09-28 17:42:02 +00:00
Treehugger Robot
f0aa998233 Merge "Rerun of update-api with no changes" 2016-09-28 17:41:53 +00:00
Andreas Huber
0f7eb16fad Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac
am: 2849ee8b75

Change-Id: I00d47819095dd8b52dae52f3d55d6b3bc9998aaf
2016-09-28 17:36:31 +00:00
Andreas Huber
2849ee8b75 Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
am: 90acbd86ac

Change-Id: Ia3013237296ccca46e3f4e0bc702b4ae90a7ea3a
2016-09-28 17:30:23 +00:00
Treehugger Robot
90acbd86ac Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" 2016-09-28 17:16:52 +00:00
ryang
44df10ebf7 Merge "hwui: Fix the length of partial updates system property" am: faf945a773 am: 73f2e9b812
am: 3734e98095

Change-Id: I88c1092a7fcce45d80bb2f5cd7d14b25e0660f40
2016-09-28 17:10:58 +00:00
ryang
3734e98095 Merge "hwui: Fix the length of partial updates system property" am: faf945a773
am: 73f2e9b812

Change-Id: Ibcc55a59fd29614e491843a0dbbcfd316f423312
2016-09-28 17:04:26 +00:00
ryang
73f2e9b812 Merge "hwui: Fix the length of partial updates system property"
am: faf945a773

Change-Id: I2f98f29446c9a303e72f0ff6a3ddd2612e369c0a
2016-09-28 16:58:57 +00:00
Treehugger Robot
faf945a773 Merge "hwui: Fix the length of partial updates system property" 2016-09-28 16:47:03 +00:00
yuanhuihui
de671ad0e6 Merge "fix persistent process is killed and restart again and again" am: ae302cef52 am: b322dc384e
am: 20a5fe414e

Change-Id: I9a454463a8881dded9b3d7905d4cf76223b4acd4
2016-09-28 16:41:56 +00:00
yuanhuihui
20a5fe414e Merge "fix persistent process is killed and restart again and again" am: ae302cef52
am: b322dc384e

Change-Id: Ie1802af0a6f22cb69c3b62f0912363a299f8f453
2016-09-28 16:36:47 +00:00
yuanhuihui
b322dc384e Merge "fix persistent process is killed and restart again and again"
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3
2016-09-28 16:30:25 +00:00
Treehugger Robot
ae302cef52 Merge "fix persistent process is killed and restart again and again" 2016-09-28 16:20:56 +00:00
Erik Kline
9cb41da22a Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev am: 0f53f6ffa2
am: 42202aa881

Change-Id: I3509b5f1e1536eaa727ae023d7b0af0e623ab49f
2016-09-28 15:59:14 +00:00
Neil Fuller
4c1d37b2a0 Unhide constants related to type annotations
Type annotations are supported in the compiler, but not the
Android runtime. Unhiding these is therefore still
reasonable.

Bug: 30391692
Test: make droid
Change-Id: I39db1099918fe3bd6321f2d755a988cb73f657c6
2016-09-28 16:57:59 +01:00
Erik Kline
271e731d3c Support triggering confirmConfiguration() via dumpsys am: c3eec4fff9
am: eb250f0db1

Change-Id: I16d9617f7f2cb412095801f4e1ccbc34b11a2fbf
2016-09-28 15:57:55 +00:00
Neil Fuller
0543f71b82 Fix AnnotatedElement.getDeclaredAnnotation() generic signature
To match upstream OpenJDK 8.

Bug: 31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
2016-09-28 16:56:49 +01:00
Erik Kline
42202aa881 Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev
am: 0f53f6ffa2

Change-Id: Ie537f57ef151f67f8bd2f98ee7463ce95938d1c0
2016-09-28 15:52:49 +00:00
Erik Kline
eb250f0db1 Support triggering confirmConfiguration() via dumpsys
am: c3eec4fff9

Change-Id: I0b54ab6c028308e676c3f6380019c8aff809fe70
2016-09-28 15:52:47 +00:00
Neil Fuller
b36fad8a5f Rerun of update-api with no changes
Picks up a small change to Parameter.

Looks like it was caused by a mid-air collision between
commit 3ead539c01, which
introduced Parameter, and commit
b4fcc6136e which
introduced improvements to generics in the .txt file.

Test: make droid
Change-Id: If1c11e9303d17854ab1e5559c9a412cc6de54685
2016-09-28 16:51:03 +01:00
TreeHugger Robot
0f53f6ffa2 Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev 2016-09-28 15:46:32 +00:00
Jeremy Klein
8002b27512 Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4
am: 140e5cce70

Change-Id: I11c459514e54bb486f3a90a1b0390453fc48b857
2016-09-28 15:44:23 +00:00
Jeremy Klein
140e5cce70 Remove unused mContext from BluetoothGatt[Server].
am: adc26ec1b4

Change-Id: Ic6650d0b5de52b8c4662fb5a103a9ff2c9194d42
2016-09-28 15:38:46 +00:00
Hugo Benichi
92eb22fdd2 New Settings symbols for captive portal detection
This patch defines new Settings symbols for
  - setting the probe urls for captive portal detection.
  - setting which User-Agent to use for captive portal detection.

The existing default values for these settings are not changed, i.e:
  - HTTP and HTTPS probes urls are unchanged.
  - the fallback probe is not used.
  - User-Agent is empty by default.

Bug: 29367974
Change-Id: I6e4b3b172e56b8b67fffa4b51f776d68d5851f25
2016-09-28 23:13:25 +09:00
Hugo Benichi
d953bf853d Captive portal detection uses 3rd fallback probe
This patch adds the possitibility to send a 3rd fallback validation
probe in sendParallelHttpProbes when neither the 1st http probe nor the
https probe came back with a conclusive answer.

This 3rd probe is only used for trying again captive portal detection
and does not return success, so that network validation always fails if
the https probe fails.

In addition, the url reveals a captive portal is now sent to the
CaptivePortalLoginActivity so that all three probes can use different
urls.

Bug: 29367974

Change-Id: I7385fde1aa1316d94aac350af0e956cb193aa4ee
2016-09-28 23:12:31 +09:00
Jorim Jaggi
84afb1a967 Don't start recents if no transition is happening
Change-Id: I06c65633139a1c0af4c9c2701ec16c42e5a5bb69
Fixes: 31643084
2016-09-28 12:55:46 +00:00
Jorim Jaggi
6e5f3d2e9f Fix NPE in overridePlayingAppAnimations
It's not guaranteed that findMainWindow() is non-null, which can happen
if the window was just added, so we should not crash in that case.

Change-Id: I1f04876ef48bfc7636320124b7f60d6dfa0b24a2
Fixes: 31767124
2016-09-28 11:38:47 +00:00
Jakub Adamek
b19ee72760 Merge "Search for runtime resource overlays in subdir." into cw-f-dev
am: 8bb793394d

Change-Id: I00e3f842d0306c1d40e341a7624a6cf05ef4fbd6
2016-09-28 10:27:46 +00:00
Jakub Adamek
ff5cb98888 Search for runtime resource overlays in subdir.
am: 1c15c63578

Change-Id: Ie6614c07851a2365b623a455b2ccc85672d4c846
2016-09-28 10:27:41 +00:00
TreeHugger Robot
8bb793394d Merge "Search for runtime resource overlays in subdir." into cw-f-dev 2016-09-28 10:19:26 +00:00
Jakub Adamek
1c15c63578 Search for runtime resource overlays in subdir.
See go/sku-colors. This changes the directory to search for framework
overlays if the right system property is defined. This allows
OEMs to specify different resources based on device SKUs.

Bug: 31692079
Change-Id: I9cb121b286b7f52aa26de1757fde1f3110cd47fd
2016-09-28 10:09:20 +01: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
Erik Kline
c3eec4fff9 Support triggering confirmConfiguration() via dumpsys
Tested:
  - flashed to device
  - triggered
  - monitored tcpdump for the expected traffic

Bug: 30869013
Change-Id: I6a4741bdeed2aaa483f8c2281acb74d245a323e8
2016-09-28 15:19:00 +09:00
Etan Cohen
5d09ab4812 Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f
am: a96c6e222b

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50
2016-09-28 05:25:52 +00:00
Etan Cohen
a96c6e222b Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e
am: 66741c2c0f

Change-Id: I5cef0e013ff9ca49216cc1e6c8208353f2d063f4
2016-09-28 05:20:02 +00:00
Etan Cohen
66741c2c0f Merge "[NAN] Use a hidden class for peer ID opaque handle"
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31
2016-09-28 05:14:30 +00:00
Etan Cohen
e43c1a3e3e Merge "[NAN] Use a hidden class for peer ID opaque handle" 2016-09-28 05:04:06 +00:00