Commit Graph

70587 Commits

Author SHA1 Message Date
Dianne Hackborn
f5ac9e6483 Merge "New infrastructure to switch remaining commands to "cmd" calls." 2016-09-29 19:57:05 +00:00
TreeHugger Robot
c2370dfdd6 Merge "Add app op name string for a runtime permission" 2016-09-29 19:11:46 +00:00
Dianne Hackborn
354736e196 New infrastructure to switch remaining commands to "cmd" calls.
This introduces a new feature of the IBinder command protocol
to allow the shell command implementation to call back into
its caller to ask it to open files in the calling context.  This
is needed so that commands that have arguments specifying files
can open those files as the calling shell, not the system (or
whatever) process.

To test this all out, move the "am start" implementation over
to ActivityManagerShellCommand, in particular along with its
option to specify a file in which to write profiling data.

Test: Manual

Change-Id: I0c1e3857defefbd19a2ac29413aafbb34b1e48a3
2016-09-29 10:58:44 -07:00
Abodunrinwa Toki
2e0a36c4cb Merge "FloatingActionMode: Avoid calling delayed code if view is inactive." 2016-09-29 14:52:29 +00:00
Abodunrinwa Toki
d1eb19c65e FloatingActionMode: Avoid calling delayed code if view is inactive.
If something's gone wrong with the floating toolbar's host view while
there is logic posted in a runnable, avoid running that code.

These runnable callbacks are currently removed when the action mode
is finished but the issue we're running into is something else.
Seems like the app doesn't get a chance to call finish when something
went wrong with the view or host activity. Anyway, defend against
this case.

Test: Not able to reproduce the issue. This code is a defensive
fix to prevent reported crashes in GSA. Will keep if the crashes no
longer happen or revert if they continue to happen.
Bug: 29951043
Change-Id: I0e7833b8d8a63bf6205b7035b477bd8a3a7968b2
2016-09-29 10:53:21 +01:00
Hugo Benichi
76982f5588 New Settings symbols for captive portal detection am: 92eb22fdd2 am: 5e666029f9
am: 9cd1a35660

Change-Id: Iad6840b4edd243a77fe65a69a2f4dcba28e0a7cb
2016-09-29 06:09:56 +00:00
Hugo Benichi
d7c7f5b3f3 Captive portal detection uses 3rd fallback probe am: d953bf853d am: bc739d0bbc
am: 2b04d1234b

Change-Id: I221cf47aa43105d4094ec724f8d6f4f6c98d0757
2016-09-29 06:07:53 +00:00
Meng Wang
587a5f9c7f resolve merge conflicts of 68b84f73 to master
Change-Id: If4d5647d199050846aaf250c4341657440dafb78
2016-09-28 21:06:55 -07:00
Tony Mantler
8a03a064e4 AsyncTask terminating with exception calls onCancelled am: 5eb91a437c am: 3e51bb267d
am: 37c51f614c

Change-Id: Id37ed8aa1249837f4607749b40cf843393c37586
2016-09-29 02:52:54 +00:00
Eino-Ville Talvala
dce815430d DngCreator: Do not cache timezone in static initializer am: ec727411d2 am: fa141e303e
am: f6ea31d8f1

Change-Id: Ib702bb0fed2a4980ce543a1ab37d7c43179a67e8
2016-09-29 02:05:30 +00:00
Hugo Benichi
9cd1a35660 New Settings symbols for captive portal detection am: 92eb22fdd2
am: 5e666029f9

Change-Id: I6e965696ed03b0eb4a49db3b21ad6a382ba1d081
2016-09-29 01:23:59 +00:00
Hugo Benichi
2b04d1234b Captive portal detection uses 3rd fallback probe am: d953bf853d
am: bc739d0bbc

Change-Id: Iec8ccdbcd433d8b2f5538d7b4bed5c945b5b688a
2016-09-29 01:22:01 +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
Meng Wang
68b84f7301 Support WFC roaming preference am: 2c25e4a96b
am: 6db4fbecf8

Change-Id: Idff74a470e26b6c14ba1203290f533813740e192
2016-09-29 00:29:17 +00:00
Meng Wang
6db4fbecf8 Support WFC roaming preference
am: 2c25e4a96b

Change-Id: I8a1af9756ddf5a4359cfd94aa6eebfdcb87b9e13
2016-09-29 00:22:01 +00:00
Tony Mantler
37c51f614c AsyncTask terminating with exception calls onCancelled am: 5eb91a437c
am: 3e51bb267d

Change-Id: I5d8766c0157541720118dd3d264875df58562907
2016-09-28 23:38:58 +00:00
Tony Mantler
3e51bb267d AsyncTask terminating with exception calls onCancelled
am: 5eb91a437c

Change-Id: If17d5621b6813c1f02d533e853ad9b8865fdbc19
2016-09-28 23:34:13 +00:00
Eino-Ville Talvala
f6ea31d8f1 DngCreator: Do not cache timezone in static initializer am: ec727411d2
am: fa141e303e

Change-Id: I3174eb2adccc587761ab64e226eda6bd59e2295a
2016-09-28 21:36:29 +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
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
0939ddf6f3 Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708 am: 3aeade44a9
am: 96ce9d16ed

Change-Id: Ideb0ba7ea8d251dae5a23c8fda7e777bbea784ac
2016-09-28 20:10:46 +00:00
Tianjie Xu
96ce9d16ed Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708
am: 3aeade44a9

Change-Id: I913474dbf87b30683267d8f6a458927b7d331c4c
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

Change-Id: I23ee644fb2f73fc3cece4faf59eb63417cfe3ea6
2016-09-28 19:59:12 +00:00
Tianjie Xu
c68e6d6708 Merge "Log the error when uncrypt timeouts"
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e
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
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
Andreas Huber
9105ca5559 Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac am: 2849ee8b75 am: 0f7eb16fad
am: d321db4481

Change-Id: Idfc104b383a5e35573084d99486e6e70a37170b8
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

Change-Id: I43c563eaba14573e94ced381791eb6ba787d3e51
2016-09-28 17:42:02 +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
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

Change-Id: If05a528312cf0a5499c6ed122961124dc0d8e917
2016-09-28 15:50:05 +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
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

Change-Id: I9db830b77e0d6ef224f7fe12e2596e3a6d9bd0e2
2016-09-28 00:22:59 +00:00
Salvador Martinez
32a87ca7a9 Changed themes for core activities am: 7e2657c303
am: f3209d6c87

Change-Id: I1595ffd9a91137666e45792f8f980355ea622f50
2016-09-28 00:16:50 +00:00
Greg Kaiser
5abcc9a888 ContextHubService: Hack around 32-bit app ID am: 1983f9b05b am: 40c0435026
am: eaed84e40a

Change-Id: I2eb38c4cf7e27bfb75db2f41b529840ac9fd1f44
2016-09-28 00:11:46 +00:00
Salvador Martinez
f3209d6c87 Changed themes for core activities
am: 7e2657c303

Change-Id: If4019d7f37ea13bbbcbaeaaccde40a112173683c
2016-09-28 00:08:55 +00:00
Christopher Tate
f11313f763 Don't leak wakelock instances am: 4b17e984b6 am: cea6cc9d33
am: 5f00f298bf

Change-Id: I0ffb39930e7a989cc54c43f4defe96b2026bec50
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

Change-Id: Ie8594f39ea791fc1beaed1bff9274526d98338dc
2016-09-27 23:54:37 +00:00
Christopher Tate
5f00f298bf Don't leak wakelock instances am: 4b17e984b6
am: cea6cc9d33

Change-Id: I908ad297251b1abd8b8502059a53363cf3be9af2
2016-09-27 23:50:20 +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