Commit Graph

65362 Commits

Author SHA1 Message Date
Dianne Hackborn
50b9f3513c Fix issue #31305336: File corrupt: too many wake locks 101
am: cb99a72e62

Change-Id: I01062999e2a1207c5d1bc826e8c9372c0fb012f7
2016-10-06 20:58:54 +00:00
Christopher Tate
3fa99a6d11 Explicitly close FD binder parameters in backup/restore API calls
am: 91bb0e5cca

Change-Id: Ibdba35d9c4e17180a7593966b4d54d6fb9c03f02
2016-10-06 20:10:56 +00:00
Hemal Patel
435e8d8921 Docs: Fixed the Service link am: 1918214589 am: eb21088b67
am: 63b5e3ddd1

Change-Id: I1b1d34bb84a66c35268a7db754e5465b4c2b8d30
2016-10-06 19:59:53 +00:00
Philip P. Moltmann
c950703424 Do not access MTP devices when disabled.
am: 5201f1e61c

Change-Id: I9aa036678f2677054666b137533e61eaeac88159
2016-10-06 19:55:28 +00:00
Tucker Sylvestro
f0b51e9db7 Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev 2016-10-06 16:08:45 +00:00
Erik Wolsheimer
e12cd3bb3b Do not listen for clock ticks, time changes, timezone changes, or time format changes when TextClock is not visible
BUG: 31840153
Change-Id: I11adf1036fb25b28aee5caba6daa1ab0d9d1f23a
2016-10-05 12:45:37 -07:00
Dianne Hackborn
cb99a72e62 Fix issue #31305336: File corrupt: too many wake locks 101
The limit is MAX_WAKELOCKS_PER_UID+1, since OverflowArrayMap
will add one more to contain the overflow.

Change-Id: I53004582daa0c405427308816728f2c1d2bef40d
2016-10-03 17:00:02 -07:00
Chris Tate
ee28c8c22c Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev 2016-10-03 21:06:22 +00:00
Hemal Patel
63b5e3ddd1 Docs: Fixed the Service link am: 1918214589
am: eb21088b67

Change-Id: Ia687d1ba27eee87abe412e8a8dd11e49e5f02100
2016-10-01 01:54:45 +00:00
Hemal Patel
eb21088b67 Docs: Fixed the Service link
am: 1918214589

Change-Id: Icfd4e033b7ef9bd915f106abc789f11fb4ede301
2016-10-01 01:45:58 +00:00
Christopher Tate
91bb0e5cca Explicitly close FD binder parameters in backup/restore API calls
CloseGuard is grateful.

Bug 30893100

Change-Id: Ia6bd4d88204839add59d9d245aad673d67b11bea
2016-09-30 17:52:19 -07:00
Philip P. Moltmann
a40092d6d2 Merge "Do not access MTP devices when disabled." into nyc-mr1-dev 2016-10-01 00:16:12 +00:00
Tao Bao
9bd481b3cf Handle the race condition when calling uncrypt services.
am: 1eabf53437

Change-Id: Ia5ac4f91618c1cf4aee67d069542676cf0a5e787
2016-09-30 23:16:37 +00:00
John Reck
5a0da698a7 SurfaceView only call forceDisconnect if isValid
am: 6ba466ff3e

Change-Id: I890142436b2442cced212550ac916bedf1306bc9
2016-09-30 23:15:04 +00:00
Tao Bao
473b048cf7 Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev 2016-09-30 23:07:38 +00:00
Philip P. Moltmann
5201f1e61c Do not access MTP devices when disabled.
The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-30 22:24:23 +00:00
Hemal Patel
1918214589 Docs: Fixed the Service link
Bug: 29086415
Change-Id: Id9505ade39c19eb817f556d72f689568148e1782
2016-09-30 14:59:23 -07:00
John Reck
6ba466ff3e SurfaceView only call forceDisconnect if isValid
Change-Id: I683c2f937f44d8b3d912839a3e91cbd5b5c7f437
Fixes: 31778946
Test: Manual, launch Cookie Jam then tap recents
2016-09-30 21:33:34 +00:00
Jorim Jaggi
0ea9093df7 Fix crash if drawable doesn't have constant state
am: 92d0602a7c

Change-Id: I8ab088ad588eac8baa674d551201713562d973ef
2016-09-30 09:10:11 +00:00
Jorim Jaggi
a04451827e Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev 2016-09-30 09:02:41 +00:00
Tao Bao
1eabf53437 Handle the race condition when calling uncrypt services.
We call uncrypt services to setup / clear bootloader control block (BCB)
for scheduling tasks under recovery (applying OTAs, performing FDR).
However, we cannot start multiple requests simultaneously. Because they
all use the same socket (/dev/socket/uncrypt) for communication and init
deletes the socket on service exits.

This CL fixes the issue by a) adding synchronized blocks for the service
requests; b) checking the availability of the socket before initiating a
new one.

Note that adding synchronized blocks to RecoverySystem doesn't help,
because the calls could be made from different processes (e.g. priv-app,
system_server).

Bug: 31526152
Test: FDR works while a priv-app keeps calling clear BCB.

Change-Id: I95308989e849a9c98a9503ac509f2bc51ed3de19
(cherry picked from commit 794c8b0b3f)
2016-09-29 23:12:16 -07:00
Tianjie Xu
1eb20e1bda Log the error when uncrypt timeouts
am: 2a03586998

Change-Id: I9d85069026d777468cb41dcdf5e2ecd83812efb1
2016-09-29 18:10:00 +00:00
Tianjie Xu
e422b0b29f Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev 2016-09-29 18:03:30 +00:00
Jorim Jaggi
92d0602a7c Fix crash if drawable doesn't have constant state
Change-Id: I2364efb9dc1446bc1a8c50abf6bd34a73c226f7e
Fixes: 31755893
2016-09-29 14:37:14 +00:00
Hugo Benichi
5e666029f9 New Settings symbols for captive portal detection
am: 92eb22fdd2

Change-Id: Id8c19f16c50b22034278c00b55c5431d892f8a95
2016-09-29 01:15:17 +00:00
Hugo Benichi
bc739d0bbc Captive portal detection uses 3rd fallback probe
am: d953bf853d

Change-Id: I15607fbfae9dc127b72b6f299b69d6b648117338
2016-09-29 01:13:59 +00:00
Hugo Benichi
3fc76c4669 Merge "New Settings symbols for captive portal detection" into nyc-mr1-dev 2016-09-29 01:07:00 +00:00
Hugo Benichi
434fa32f82 Merge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev 2016-09-29 01:06:35 +00:00
Meng Wang
6db4fbecf8 Support WFC roaming preference
am: 2c25e4a96b

Change-Id: I8a1af9756ddf5a4359cfd94aa6eebfdcb87b9e13
2016-09-29 00:22:01 +00:00
Meng Wang
cfe950f6be Merge "Support WFC roaming preference" into nyc-mr1-dev 2016-09-29 00:13:51 +00:00
Tony Mantler
3e51bb267d AsyncTask terminating with exception calls onCancelled
am: 5eb91a437c

Change-Id: If17d5621b6813c1f02d533e853ad9b8865fdbc19
2016-09-28 23:34:13 +00:00
Tony Mantler
647625fbf8 Merge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev 2016-09-28 23:25:54 +00:00
Eino-Ville Talvala
fa141e303e DngCreator: Do not cache timezone in static initializer
am: ec727411d2

Change-Id: I86d207b7bfd156f5296aa3f5ba5acecd2d762d4e
2016-09-28 21:27:21 +00:00
Eino-Ville Talvala
4e3bb26f64 Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev 2016-09-28 21:20:21 +00:00
Tony Mantler
5eb91a437c AsyncTask terminating with exception calls onCancelled
Test: cts/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
b/30304893

Change-Id: Icb50cda8026ddd70d457b5e62eb29c81313ee47d
2016-09-28 21:16:56 +00: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
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
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
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
f3209d6c87 Changed themes for core activities
am: 7e2657c303

Change-Id: If4019d7f37ea13bbbcbaeaaccde40a112173683c
2016-09-28 00:08:55 +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
40c0435026 ContextHubService: Hack around 32-bit app ID
am: 1983f9b05b

Change-Id: I9b87a8f35d2f97dcea4bbd73fd2783e1ece26d33
2016-09-27 23:46:08 +00:00
Christopher Tate
cea6cc9d33 Don't leak wakelock instances
am: 4b17e984b6

Change-Id: I952939e1d7e7b7f3ddfff7ecdfb7f3ca70bd9b70
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
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
18b725ac0a [DO NOT MERGE] Use tokens instead of account access trackers
am: 32bfb594af

Change-Id: I1706ecca7b3b98a2a38483545270941ce8899939
2016-09-27 20:51:28 +00:00