1681 Commits

Author SHA1 Message Date
Mitchell Wills
8efb84e3e0 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0.

Change-Id: I23e8b6ac97d8853c271429fc13fbfa313717a95a
2016-08-29 20:15:48 -07:00
Svetoslav Ganov
40f8b92518 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
2016-08-29 11:26:51 -07:00
Dmitriy Filchenko
33e65232f3 Merge "Remove unused includes."
am: 35da832634

Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
2016-08-18 03:22:39 +00:00
Dmitriy Filchenko
7310cc4880 Remove unused includes.
BUG: 29824203

Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
2016-08-18 01:45:11 +00:00
Dimitry Ivanov
4e3a78a5ff Merge "libsigchain: intercept bsd_signal on lp32"
am: 6eb30f2060

Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
2016-08-01 22:46:55 +00:00
Dimitry Ivanov
4c5281862f libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.

libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.

Bug: http://b/30562229
Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported
      readelf --dyn-sym app_process64 and check that bsd_signal is not exported
Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858
2016-08-01 14:19:26 -07:00
Sai Kiran Korwar
9495872add Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am: 189bbd9f6d

Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189
2016-07-25 03:46:44 +00:00
Jesse Hall
189bbd9f6d Merge "bootanimation: Call eglReleaseThread in threadLoop" 2016-07-25 03:36:57 +00:00
Dmitriy Filchenko
d5a72fae4a Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358
2016-07-19 00:19:15 +00:00
Dmitriy Filchenko
f5b6e5590e Handle long process names correctly.
pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.

Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
2016-07-18 16:03:05 -07:00
Dmitriy Filchenko
c1a1487057 Merge \"Remove calls to set_process_name.\"
am: 8ee58b3b4e

Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
2016-07-13 19:57:52 +00:00
Dmitriy Filchenko
342c7dcd02 Remove calls to set_process_name.
BUG:29824203

Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
2016-07-12 15:44:55 -07:00
Christopher Tate
abf0d56469 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am: 0f101342e1

Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6
2016-06-20 17:35:04 +00:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
Sudheer Shanka
098bc0d840 Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am: f6824b51cc

Change-Id: I137151742049c0a02d41a02e49abb679234f14b9
2016-06-17 22:08:07 +00:00
Sudheer Shanka
bf0a9a7445 Add pm operation to set user restrictions.
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
2016-06-16 09:43:29 -07:00
Christopher Tate
e227ec61c2 Let bmgr inspect the set of whitelisted transports
Needed for compliance testing.

Bug 29072466

Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Sai Kiran Korwar
3eee9fbb6d bootanimation: Call eglReleaseThread in threadLoop
Add eglReleaseThread call in the threadLoop function to
ensure that the thread properly cleans up its resources
before exiting.

Change-Id: I90dff47370e7acaecc046c43f0bb274214a29f77
2016-05-26 09:38:50 -06:00
Allen Hair
79f42608c2 Merge "Deprecate shell-based UI Automator." into nyc-dev
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75
2016-05-24 21:36:20 +00:00
Allen Hair
3fb03313e9 Deprecate shell-based UI Automator.
Change-Id: I15aee7a6aba551b737d2c41b4fafd5b0ced9a4b7
2016-05-24 11:10:44 -07:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Dianne Hackborn
0c4e6a8da3 Fix issue #27532364: Security Vulnerability in IIntentSender.send
We need to make IIntentSender oneway...  but when the system is
calling that for itself, it needs to be able to return a result code.

Solution: instead of directly calling the interface, we have a new
IPC through the activity manager.  If the thing being used is the
activity manager impl, it can do the synchronous send and return
the result directly in place.  If not, you only get asynchronous
sending and thus never a failure result back (too bad for you!).

Change-Id: I4096e5b00063e8dba66230585a2dfe67e35e8092
2016-05-13 17:37:08 -07:00
Christopher Tate
2591ee2b0b Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev
am: 0588954071

* commit '058895407140de0e513b82150c3acb6131e971a2':
  Move the 'pretend idle jobs can run now' broadcast into AMS

Change-Id: Id8bd50f0a5f6d46cf60dea690803081515cb21c3
2016-05-06 21:42:47 +00:00
Christopher Tate
27d92e4e39 Move the 'pretend idle jobs can run now' broadcast into AMS
It's a protected broadcast, so sending it directly from 'am' is
no longer an option.  This is needed for CTS as well as being
generally useful during app development.

Bug 28406044

Change-Id: I101915a8c6f19454330a8db2079a75023c112582
2016-05-06 11:25:11 -07:00
Dimitry Ivanov
3088ff85a5 zygote: Remove NativeLoader initialization step
This now done by art Runtime::Start()

Bug: http://b/28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
(cherry picked from commit 6a850b3f11cff546c962fc87ffc961a267973cd4)
2016-04-27 13:40:43 -07:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
2016-04-27 13:16:17 -07:00
Dimitry Ivanov
0598038341 Merge "zygote: Remove NativeLoader initialization step"
am: 4dd00e9

* commit '4dd00e93f300a50097c1ec09ca291849830e98dc':
  zygote: Remove NativeLoader initialization step

Change-Id: I5ea672ea9e58720d37e29a9407e7c963b5cf65dd
2016-04-27 18:33:56 +00:00
Dimitry Ivanov
6a850b3f11 zygote: Remove NativeLoader initialization step
This now done by art Runtime::Start()

Bug: http://b/28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
2016-04-27 10:22:09 -07:00
Andrii Kulian
2b5f967c46 Merge "Allow setting fullscreen stack as target via adb shell" into nyc-dev
am: a4ab6a0

* commit 'a4ab6a0683c33f5509bd1e2617c5d2b43756b05f':
  Allow setting fullscreen stack as target via adb shell

Change-Id: I050ca50bc8ca4962a5bb367e8fb1bd62ed18ad17
2016-04-27 02:19:45 +00:00
Andrii Kulian
a4ab6a0683 Merge "Allow setting fullscreen stack as target via adb shell" into nyc-dev 2016-04-27 02:13:12 +00:00
Todd Kennedy
9a50b6abf1 Merge "Don\'t override pre-release target sdk" into nyc-dev
am: 97ef0e7

* commit '97ef0e77afa3be6255b70c8567843ac298386251':
  Don't override pre-release target sdk

Change-Id: Ib70b0e908dc148799875afcedeeb1d59f2d90367
2016-04-27 00:58:47 +00:00
Todd Kennedy
b107271813 Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.

Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
2016-04-26 16:25:43 -07:00
Todd Kennedy
61c24ded75 Merge "Add "do not kill" install option" into nyc-dev
am: 6958226

* commit '69582262f0dfa8cdca232d03ff3239fa026326ab':
  Add "do not kill" install option

Change-Id: I438e486400d00070fd424cb811e578d5f3a1c60d
2016-04-26 17:24:02 +00:00
Andrii Kulian
435ce5ff1c Allow setting fullscreen stack as target via adb shell
Bug: 27906038
Change-Id: Ie6feede3f7c412bc51550626a008cb0729e5e0e0
2016-04-26 00:00:01 -07:00
Tobias Thierer
9d1357c44e Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
am: 1b33b45038

* commit '1b33b450381855a6403a577a2613093c578d6754':
  Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL).

Change-Id: If82fea1bcf30adf8412becbb13aa599837d00a57
2016-04-22 14:54:48 +00:00
Tobias Thierer
1b33b45038 Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)." 2016-04-22 14:43:52 +00:00
Tobias Thierer
28532d0026 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
(cherry picked from commit 4bd017d6a5437f153b2b0a149a5dde0b85bf6907)

Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
2016-04-22 13:36:53 +01:00
Tobias Thierer
8e9bd59555 Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
am: 09ae4931a9

* commit '09ae4931a98cb0cb7edac257db30169098ab56c7':
  frameworks/base: Avoid Long object allocations in Long.valueOf()

Change-Id: I23e77831c7f167da8329143710cd9c4fb389df0e
2016-04-22 10:42:36 +00:00
Todd Kennedy
47763629fe Add "do not kill" install option
Passing the "--dont-kill" argument to pm install-create can be used to
install a feature split without killing the contianing application.
Use with caution.

Bug: 27780548
Change-Id: I743ac4f640c9c4251d1b3bc70ddf428bd79e07bf
2016-04-21 15:21:20 -07:00
Tobias Thierer
a1adc6ff82 Fix needless value boxing/unboxing in Am.java
(except the Long unboxing covered by a separate CL).

Tested: Successfully built frameworks/base

Bug: 28289401
Change-Id: I40d09af9c003b7667cb96171747bd355d7a9dc4f
2016-04-21 18:51:25 +01:00
Tobias Thierer
4bd017d6a5 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
2016-04-21 16:23:56 +01:00
Kenny Guy
75d4db49d9 Merge "Add test method to remove admins." into nyc-dev
am: 3c5ceae

* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
  Add test method to remove admins.

Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
2016-04-19 21:53:23 +00:00
Kenny Guy
38dcca51a7 Add test method to remove admins.
Add test method to remove admins that declare
FLAG_TEST_APP without informing them.
The method will also remove the device and profile
owner status of the admin.

Bug: 28027468
Change-Id: Idb4d3299a9c6595c94bfb424546cd8a384131835
2016-04-19 20:10:56 +01:00
Narayan Kamath
3a00b69702 Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

* commit 'a09b4d2a611a7606e8fc8c73a24bd941b6fc173f':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Jeff Sharkey
16e0976152 Merge "Give users and devices control over sdcardfs." into nyc-dev
am: 7d66e83

* commit '7d66e8313958e8225ea6c3df2ca6696dbc6d3d79':
  Give users and devices control over sdcardfs.

Change-Id: Ie2861a3268768fd6ed55e20bc8a746bb3bc61fff
2016-04-07 17:56:33 +00:00
Jeff Sharkey
33dd156ed0 Give users and devices control over sdcardfs.
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE.  Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.

Bug: 27991427
Change-Id: Ia57f12f6ead888ab85101004bdd8c8003537b116
2016-04-07 11:30:55 -06:00
Philip P. Moltmann
537c8bdf20 Merge "Allow to provide only a component name prefix to \'am instrument\'" into nyc-dev
am: 7a27611

* commit '7a27611646667bca6a034946bd46f56d2260a5ba':
  Allow to provide only a component name prefix to 'am instrument'

Change-Id: I1b087f1f53e6b3607dcbdfb08a8ec58befa0da26
2016-04-05 23:38:01 +00:00
Philip P. Moltmann
01ee1b7eb6 Allow to provide only a component name prefix to 'am instrument'
Bug: 27831862
Change-Id: I1d57e416c47fc7d9ea212f0002986932663081b8
2016-04-04 16:37:37 -07:00
Jeff Sharkey
7fc8b9ce48 Merge "Support direct-boot tests." into nyc-dev
am: 7d718bb

* commit '7d718bb252fe2bdee0c9c728a1e6e4892deb8ac7':
  Support direct-boot tests.

Change-Id: I65205c39260d68130de4787eb2be724006ff8a66
2016-04-03 04:07:02 +00:00