Commit Graph

1795 Commits

Author SHA1 Message Date
Paul Duffin
b6961ffa53 Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b
am: 9cb5f2815d

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b
2016-12-07 13:16:12 +00:00
Paul Duffin
9cb5f2815d Merge "Replace core-junit with junit" am: 6ac5293751
am: a4d7100a3b

Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55
2016-12-07 13:08:36 +00:00
Paul Duffin
6ac5293751 Merge "Replace core-junit with junit" 2016-12-07 12:52:03 +00:00
Damien Bargiacchi
e2ca6b465e Centre clock text on visible characters instead of : character am: 45a7644004
am: 04f17be3e6

Change-Id: Ia6af0064f606062a646aa3e251b56631992aa86b
2016-12-06 18:40:39 +00:00
Damien Bargiacchi
04f17be3e6 Centre clock text on visible characters instead of : character
am: 45a7644004

Change-Id: Ibb152f2217297ab0b0aa1ec622e59ae8ae815d59
2016-12-06 18:32:48 +00:00
Paul Duffin
9249205d1b Replace core-junit with junit
Bug: 30188076
Test: make checkbuild
Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
2016-12-06 14:32:41 +00:00
Damien Bargiacchi
45a7644004 Centre clock text on visible characters instead of : character
Bug: 33340845
Change-Id: I235ad7c6aafc62daa55242f81df2d076f27c56df
2016-12-05 18:02:18 -08:00
Andreas Gampe
779f824a1b Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd am: 0662cd5de8
am: 1c82020e2a

Change-Id: I8c93bcf457c7bf7af78d13667922f908af7cb3d1
2016-12-01 03:09:52 +00:00
Andreas Gampe
1c82020e2a Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd
am: 0662cd5de8

Change-Id: I6df03a4573610d600a037b52635414bc600772e0
2016-12-01 02:59:01 +00:00
Andreas Gampe
0662cd5de8 Merge "App_process: Merge app_process and app_process__asan"
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
2016-12-01 02:48:18 +00:00
Andreas Gampe
2200e09736 App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.

Bug: 33224213
Test: mmma frameworks/base/cmds/app_process && \
      mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
      frameworks/base/cmds/app_process && \
      ls $OUT/system/bin/asanwrapper && \
      readelf -s $OUT/system/bin/app_process32 | grep asan && \
      readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \

Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
2016-11-30 16:35:32 -08:00
Andreas Gampe
8c6429cb3e Merge "App_process: Clean up sanitized binaries" am: 273adb5257 am: c07a430722
am: 85b63db42a

Change-Id: I083cc7d1a906c5b2996d382e465be745b724b1f9
2016-12-01 00:28:19 +00:00
Glenn Kasten
039d7cc30d Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f am: 25889e4d6c
am: c408777f36

Change-Id: I150ff727e35ddac8dc2a8401a3cd5e2d4a04bd2d
2016-12-01 00:21:48 +00:00
Andreas Gampe
85b63db42a Merge "App_process: Clean up sanitized binaries" am: 273adb5257
am: c07a430722

Change-Id: Ib507ba1a1abd185ed6977722f9c1cb42cf84eab0
2016-12-01 00:20:05 +00:00
Glenn Kasten
c408777f36 Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f
am: 25889e4d6c

Change-Id: I556e40803c942626dceafc7e12278d75ef33337f
2016-12-01 00:17:36 +00:00
Andreas Gampe
c07a430722 Merge "App_process: Clean up sanitized binaries"
am: 273adb5257

Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
2016-12-01 00:09:00 +00:00
Glenn Kasten
25889e4d6c Merge "LOCAL_CLANG := true is now the default"
am: 1204e3806f

Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
2016-12-01 00:06:49 +00:00
Andreas Gampe
622f511f2f App_process: Clean up sanitized binaries
Clean up the definition of sanitized binaries. Clean up the
Android.mk to share values.

Bug: 33224213
Test: mmma SANITIZE_TARGET=address SANITIZE_LITE=true frameworks/base/cmds/app_process && ls $OUT/system/bin/asan
Change-Id: I70f8d95ff2ec6366fc0a7d252b91dce268186910
2016-11-30 09:46:09 -08:00
Glenn Kasten
827d0d76fb LOCAL_CLANG := true is now the default
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit 3a7510bcf6)
2016-11-30 09:42:23 -08:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5)
2016-11-15 15:29:45 -08:00
Svetoslav Ganov
afb49d395e Add WiFi toggle prompts - framework am: 6c3032f16b
am: 23328d9714

Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
2016-11-15 03:40:16 +00:00
Svetoslav Ganov
6c3032f16b 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

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a7)
2016-11-14 18:34:40 -08:00
Svetoslav Ganov
0efa843e72 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
Test: Unit Tests

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-11-14 10:26:52 -08:00
Michael Kwan
ef945b6706 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
2016-11-03 19:18:21 +00:00
Damien Bargiacchi
bb2e8993f0 Allow boot clock to be toggled between 12 and 24 hour format am: 9071db1d37
am: 3400dffcad

Change-Id: Ic4df64d163845547416ef1280ae2ba2f1b41efda
2016-11-01 01:52:09 +00:00
Damien Bargiacchi
3400dffcad Allow boot clock to be toggled between 12 and 24 hour format
am: 9071db1d37

Change-Id: Ief7d44034df3a59adc2f65ba79154a1ee933040c
2016-11-01 01:46:37 +00:00
TreeHugger Robot
71a865d22d Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev 2016-11-01 01:40:01 +00:00
Damien Bargiacchi
9071db1d37 Allow boot clock to be toggled between 12 and 24 hour format
Bug: 32461548
Change-Id: I414192e6d9f3ae44267f4a360e35647f18c420b4
2016-10-28 18:04:48 -07:00
Igor Murashkin
7ab062fd66 Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d
am: 4aa38633fe

Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
2016-10-28 18:00:11 +00:00
Igor Murashkin
d0d99d8a3d Merge "app_process: Forward -cp/-classpath to ART."
am: 4a4a8f1555

Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
2016-10-28 17:48:15 +00:00
Treehugger Robot
4a4a8f1555 Merge "app_process: Forward -cp/-classpath to ART." 2016-10-28 17:34:47 +00:00
Fyodor Kupolov
f4fba91b5f [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d
am: c9102f2ae2

Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
2016-10-28 00:39:12 +00:00
Fyodor Kupolov
7c9a91094d [DO NOT MERGE] Only setSize if -s arg is specified
am: b87a491de6

Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
2016-10-28 00:21:10 +00:00
Fyodor Kupolov
b87a491de6 [DO NOT MERGE] Only setSize if -s arg is specified
Calculate size of installed APKs only when INSTALL_EXTERNAL flag is set.
calculateInstalledSize is expensive and may take up to 20% of total
installation time.

Bug: 32180551
Bug: 29932779
Change-Id: I173d2b38820cc86cbfacecd1bacef57369d10af7
2016-10-27 15:29:41 -07:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Martin Wallgren
3970c44547 RRO: Synchronize access to overlays.list am: 0fbb608110
am: dce79f10ba

Change-Id: Idc121ffe64f1bc7b5bdcb1a800305165f27f1c0a
2016-10-12 21:09:42 +00:00
Martin Wallgren
dce79f10ba RRO: Synchronize access to overlays.list
am: 0fbb608110

Change-Id: I44a716df3954b6d2d58d7c9784f8b55cf041b10b
2016-10-12 21:03:11 +00:00
Martin Wallgren
0fbb608110 RRO: Synchronize access to overlays.list
idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.

Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.

Cherry-picked from AOSP.

Bug: 28032298
Test: manual
Change-Id: I51d39f121d207b11181340b68b164b60020f0c61
2016-10-12 14:56:31 +00:00
Adam Lesinski
78382db820 Merge "RRO: Synchronize access to overlays.list" 2016-10-12 14:52:49 +00:00
Martin Wallgren
f12af5e907 RRO: Synchronize access to overlays.list
idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.

Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.

Bug: 28032298

Change-Id: I51d39f121d207b11181340b68b164b60020f0c61
2016-10-12 15:42:04 +09:00
Shunta Sato
4549426d6e Fix: "adb install -s" adaptation for session based install am: 4f26cb5a36
am: 55bcb9f422

Change-Id: Id9dcfdd12f190744fe84136c0a53e2cfb6638516
2016-10-11 16:57:34 +00:00
Shunta Sato
55bcb9f422 Fix: "adb install -s" adaptation for session based install
am: 4f26cb5a36

Change-Id: I65d94a002a382c2a2b91d6b8348c003b9e6ab859
2016-10-11 16:52:33 +00:00
Shunta Sato
4f26cb5a36 Fix: "adb install -s" adaptation for session based install
Internal implementation of "adb install" has been changed to
session install. As a result '-s' option doesn't work.
Size info is required when using '-s' option in session install.
PackageHelper.fitsOnExternal() returns false and moving app to SD is
failed when size info is not set.

So set size info when '-s' option is used.
And change identity on some method because shell doesn't have some
permission to access to asec.

Bug: 29932779
Author: Ryuki Nakamura <ryuki.x.nakamura@sonymobile.com>
Change-Id: I65edcc0f01ceecaaba17792ad329791a9253d603
2016-10-11 06:33:22 -07:00
Elliott Hughes
437b8c95a8 Merge "Rely on the platform -std default." am: 66f15cc01b am: 5a989a504a
am: 39ad1b92fa

Change-Id: Iec4bca8e96c776d61c5da5540a74acc6773c2bce
2016-10-08 22:03:56 +00:00
Elliott Hughes
39ad1b92fa Merge "Rely on the platform -std default." am: 66f15cc01b
am: 5a989a504a

Change-Id: I1e8593f68eaafb254c92f004c2694ca4145c910a
2016-10-08 21:58:52 +00:00