OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdd TimeZoneRulesDataContract to system API
Neil Fuller [Tue, 7 Nov 2017 02:05:44 +0000 (02:05 +0000)]
Add TimeZoneRulesDataContract to system API
am: 0ab8a0d27b

Change-Id: I94ad4699cc6afb98157fe7d295e9ec502a2d7d14

6 years agoAdd TimeZoneRulesDataContract to system API
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Add TimeZoneRulesDataContract to system API

Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).

Bug: 31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8

6 years agoMerge "Move isServiceReady to ImsServiceProxyCompat" am: e158cdaaa5
Jordan Liu [Tue, 7 Nov 2017 00:33:20 +0000 (00:33 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat" am: e158cdaaa5
am: 909a889436

Change-Id: I24c1b7009f54b20ba5231a81ecf67150f7345df1

6 years agoMerge "Move isServiceReady to ImsServiceProxyCompat"
Jordan Liu [Tue, 7 Nov 2017 00:20:00 +0000 (00:20 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
am: e158cdaaa5

Change-Id: I7ce73ab2a139b299de806f9d856544a382fe69e0

6 years agoMerge "Move isServiceReady to ImsServiceProxyCompat"
Jordan Liu [Tue, 7 Nov 2017 00:07:11 +0000 (00:07 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"

6 years agoMerge "cmds: add #!s" am: 8911c35df3
George Burgess IV [Mon, 6 Nov 2017 23:45:01 +0000 (23:45 +0000)]
Merge "cmds: add #!s" am: 8911c35df3
am: 2c61e3de27

Change-Id: Ifb1e12b63312570b5451b0e548adf0a5d25c4010

6 years agoMerge "cmds: add #!s"
George Burgess IV [Mon, 6 Nov 2017 23:35:24 +0000 (23:35 +0000)]
Merge "cmds: add #!s"
am: 8911c35df3

Change-Id: Iad6d62889031046a063e6abdd0ed74143c58ba94

6 years agoMerge "cmds: add #!s"
Treehugger Robot [Mon, 6 Nov 2017 23:25:27 +0000 (23:25 +0000)]
Merge "cmds: add #!s"

6 years agoMerge "Allow to attach jvmti agents from inside of process" am: faffb072a4
Philip P. Moltmann [Mon, 6 Nov 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Allow to attach jvmti agents from inside of process" am: faffb072a4
am: 491058e089

Change-Id: Ib636dd1ebcee0bfbd57e12e632137561bb661d3e

6 years agoMerge "Allow to attach jvmti agents from inside of process"
Philip P. Moltmann [Mon, 6 Nov 2017 20:46:12 +0000 (20:46 +0000)]
Merge "Allow to attach jvmti agents from inside of process"
am: faffb072a4

Change-Id: I1f87e45ad3a7c93ab3ba7fd27ac57a1768885faa

6 years agoMerge "Allow to attach jvmti agents from inside of process"
Treehugger Robot [Mon, 6 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Allow to attach jvmti agents from inside of process"

6 years agoMerge "Display the HD icon in the Call Log" am: 3ef58c56b6
Qi Wang [Mon, 6 Nov 2017 19:49:46 +0000 (19:49 +0000)]
Merge "Display the HD icon in the Call Log" am: 3ef58c56b6
am: 50fb8ff6da

Change-Id: Idffacab6edf8bdaf7fb133560f5e9d50cc2c28de

6 years agoMerge "Display the HD icon in the Call Log"
Qi Wang [Mon, 6 Nov 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Display the HD icon in the Call Log"
am: 3ef58c56b6

Change-Id: I967c73f1283204fd4f706c425b82fe7af101cb3a

6 years agoMerge "Display the HD icon in the Call Log"
Qi Wang [Mon, 6 Nov 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Display the HD icon in the Call Log"

6 years agoMerge "Fix issues with TRON app transition logging" into oc-mr1-dev
Jorim Jaggi [Mon, 6 Nov 2017 19:11:00 +0000 (19:11 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev
am: 9db99f4e23

Change-Id: I60369174d96333cd2703bc765d6d1ddc0f4ab48e

6 years agoMerge "Fix issues with TRON app transition logging" into oc-mr1-dev
Jorim Jaggi [Mon, 6 Nov 2017 19:01:06 +0000 (19:01 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev

6 years agoMerge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29
Hugo Benichi [Mon, 6 Nov 2017 07:31:39 +0000 (07:31 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29
am: d025358166

Change-Id: If6bf966ba547a2ce50e17340e0374dd9b75b80d9

6 years agoMerge "DefaultNetworkEvent metrics: rehaul"
Hugo Benichi [Mon, 6 Nov 2017 07:21:53 +0000 (07:21 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"
am: 69c9402a29

Change-Id: I7a5d45feb2315779dad4b0a4f69e761eb90f4ed6

6 years agoMerge "DefaultNetworkEvent metrics: rehaul"
Hugo Benichi [Mon, 6 Nov 2017 07:09:49 +0000 (07:09 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"

6 years agoDefaultNetworkEvent metrics: rehaul
Hugo Benichi [Fri, 20 Oct 2017 00:25:29 +0000 (09:25 +0900)]
DefaultNetworkEvent metrics: rehaul

This patch changes instrumentation of default networks and default
network events:
- stop logging events for default network transitions,
  but instead consistently log one event per continuous segment
  when one given network was the default, including logging an
  event for when there is no default network.
- keep a separate rolling buffer of DefaultNetworkEvent for
  dumpsys and bug reports.

These changes allow to simplify post aggregation of default network
event metrics by removing any need to do time series processing.
Instead, metrics and counters can be implemented withouth any ambiguity
by following the recipe:

% of x = sum(duration | x = true) / sum (all durations)

where x can be various conditions such as:
- the default network was validated
- the default network was WiFi
- the default network was IPv6
- there was no default network
- ...

Most importantly, this new logging scheme allows to measure much more
reliably:
- the % of the time that a device had Internet, in the sense that the
default network was validated.
- the time transitions between default networks, keyed by previous and
new transports/link layer, which allows to derive wakelock durations
and wakelock power costs from default network switches.

This patch also simplifies the dumpsys interface of the connmetrics
service and reduces the commands to three:
- "flush" for metrics upload.
- "proto" for printing buffered event in text proto format.
- "list" for listing all events and statistics.

Bug: 34901696
Bug: 65700460
Test: runtest frameworks-net
Change-Id: I0521f1681a60cca07ac3bfd5741d64ce44de4cdd

6 years agoMerge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am...
Erik Kline [Sun, 5 Nov 2017 09:07:22 +0000 (09:07 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am: 6d14940a0e
am: 93052429e0

Change-Id: I9ecce595354bafba65df8d63e868be73d91b9503

6 years agoMerge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
Erik Kline [Sun, 5 Nov 2017 08:57:48 +0000 (08:57 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
am: 6d14940a0e

Change-Id: Id3a55dac1b99cfef7f7372eeac18973936f0c6e6

6 years agoMerge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
Treehugger Robot [Sun, 5 Nov 2017 08:47:53 +0000 (08:47 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"

6 years agocmds: add #!s
George Burgess IV [Sat, 4 Nov 2017 22:58:58 +0000 (15:58 -0700)]
cmds: add #!s

Without this, exec()ing these fails.

Found with `grep -L bin/sh $(grep -Rl Script)`

Bug: None
Test: exec()ed each of these scripts; I no longer get "exec format
error" for any of them.
Change-Id: I47db5007e5cc14ab91eb846b7bffecb925d37874

6 years agoRename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()
Erik Kline [Tue, 31 Oct 2017 02:37:41 +0000 (11:37 +0900)]
Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()

Callers of IpClient can tell it via the Builder whether a stable or
a random link-layer identifier is used.  IpClient will make the
appropriate IP-layer adjustments (for now this means RFC 7217
addresses or not).

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh runs as well
      as possible on AOSP (no new errors)
Bug: 62476366
Change-Id: Ic9d52ea4f2c6c3588852ed41c81f8664d5cc298a

6 years agoMerge "Define NOT_ROAMING network capability." am: 8f380ab29c
Jeff Sharkey [Fri, 3 Nov 2017 23:07:03 +0000 (23:07 +0000)]
Merge "Define NOT_ROAMING network capability." am: 8f380ab29c
am: 3fe1ae29cd

Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987

6 years agoMerge "Define NOT_ROAMING network capability."
Jeff Sharkey [Fri, 3 Nov 2017 22:52:15 +0000 (22:52 +0000)]
Merge "Define NOT_ROAMING network capability."
am: 8f380ab29c

Change-Id: If36fa11d97d0631df41191ea0cf4ce39981b236f

6 years agoMerge "Define NOT_ROAMING network capability."
Jeff Sharkey [Fri, 3 Nov 2017 22:41:51 +0000 (22:41 +0000)]
Merge "Define NOT_ROAMING network capability."

6 years agoMerge "Respect Accessory timeout value when restoring defaults" am: 3ddf22e69c
Selim Gurun [Fri, 3 Nov 2017 22:32:26 +0000 (22:32 +0000)]
Merge "Respect Accessory timeout value when restoring defaults" am: 3ddf22e69c
am: c37036d164

Change-Id: Id6feac7351a4627c0a4a90b67899ee2c1aa469e8

6 years agoMerge "Respect Accessory timeout value when restoring defaults"
Selim Gurun [Fri, 3 Nov 2017 22:22:15 +0000 (22:22 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"
am: 3ddf22e69c

Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663

6 years agoFix issues with TRON app transition logging
Jorim Jaggi [Fri, 20 Oct 2017 12:33:18 +0000 (14:33 +0200)]
Fix issues with TRON app transition logging

There was a case where a app launch started activity A. A step in
the UI finished A and started B in the same task. Next time A was
started it immediately finished itself, putting B at the top of
the task. Now, this launch was considered aborted because A was
finished during launching, making it invisible.

We fix this by modifying the logic to only abort the launch if the
full task is not visible anymore after an activity has been set to
invisible.

There is another case where an app launches A, finishes A, and then
launches B. In this case the home gets visible in between so we
don't consider this an app launch anymore, and correctly cancel
the logging. However it's still useful to know that this is
happening to expose it to the developer, so we log any cancel
events, no matter where they are coming from.

Test: Launch Snapchat, click Sign Up, click home, relaunch
Snapchat from home
Test: Open slow app and press home quickly to test cancel.

Change-Id: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Merged-In: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Fixes: 67094673

6 years agoMerge "Respect Accessory timeout value when restoring defaults"
Treehugger Robot [Fri, 3 Nov 2017 21:32:50 +0000 (21:32 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"

6 years agoMerge "new columns of carrierId DB" am: 9c4b4afcbc
Chen Xu [Fri, 3 Nov 2017 21:27:22 +0000 (21:27 +0000)]
Merge "new columns of carrierId DB" am: 9c4b4afcbc
am: c5d5be72a3

Change-Id: I0400b0218a3a92312aec3ca668b5b0025901ed97

6 years agoMerge "new columns of carrierId DB"
Chen Xu [Fri, 3 Nov 2017 21:17:24 +0000 (21:17 +0000)]
Merge "new columns of carrierId DB"
am: 9c4b4afcbc

Change-Id: Ie1d237edf656c49fb0b078748b4e45142f454386

6 years agoMerge "new columns of carrierId DB"
Chen Xu [Fri, 3 Nov 2017 21:08:38 +0000 (21:08 +0000)]
Merge "new columns of carrierId DB"

6 years agonew columns of carrierId DB
fionaxu [Thu, 26 Oct 2017 06:09:36 +0000 (23:09 -0700)]
new columns of carrierId DB

Bug: 64131637
Test: Unit test CarrierIdProviderTest.java
Change-Id: I5e1d061d39248be12dd1e6ff1488dd3268f5f3ae
(cherry picked from commit a9214ba0b8fc691021a27dd523e4b0b0ed1fdff7)

6 years agoAllow to attach jvmti agents from inside of process
Philip P. Moltmann [Wed, 1 Nov 2017 22:22:02 +0000 (15:22 -0700)]
Allow to attach jvmti agents from inside of process

Test: cts-tradefed run singleCommand cts-dev -m CtsJvmtiAttachingTestCases
Bug: 65016018
Change-Id: I6d445afa288c6fec1d860150159fa05ed63cf517

6 years agoMerge "Handle '&' in DexoptUtils#encodeClassLoader" am: cef5431093
Shubham Ajmera [Fri, 3 Nov 2017 16:29:26 +0000 (16:29 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" am: cef5431093
am: e563c6fe6d  -s ours

Change-Id: I542e39b55dfc15ad2cefb272e91b732329ad327c

6 years agoMerge "Handle '&' in DexoptUtils#encodeClassLoader"
Shubham Ajmera [Fri, 3 Nov 2017 16:20:32 +0000 (16:20 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader"
am: cef5431093

Change-Id: Ia7495e6a9d12dc36e5091918426e86d9a9e76821

6 years agoMerge "Handle '&' in DexoptUtils#encodeClassLoader"
Treehugger Robot [Fri, 3 Nov 2017 16:07:50 +0000 (16:07 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader"

6 years agoMove isServiceReady to ImsServiceProxyCompat
Suresh Koleti [Fri, 3 Nov 2017 12:59:25 +0000 (18:29 +0530)]
Move isServiceReady to ImsServiceProxyCompat

-- Move isServiceReady from ImsServiceProxy to its base class
   ImsServiceProxyCompat to use in ImsManager.

Test: Manual
Bug: 63920021
Change-Id: I0e136ffe8490a3ba985bfb5992c1ff2176e610fe

6 years agoMerge "ZipUtils: Rewrite in terms of zip_archive::Inflate." am: f941215d56
Narayan Kamath [Fri, 3 Nov 2017 10:23:15 +0000 (10:23 +0000)]
Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate." am: f941215d56
am: 1bed4d4880

Change-Id: I61cee0ba3cd640e914583daae64d522cc250603e

6 years agoMerge "ZipUtils: Rewrite in terms of zip_archive::Inflate."
Narayan Kamath [Fri, 3 Nov 2017 10:14:22 +0000 (10:14 +0000)]
Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate."
am: f941215d56

Change-Id: I8aa710cb6df1ba5b2079c5e3d9a70b365815d04e

6 years agoMerge "ZipUtils: Rewrite in terms of zip_archive::Inflate."
Narayan Kamath [Fri, 3 Nov 2017 10:05:28 +0000 (10:05 +0000)]
Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate."

6 years agoMerge "Disable integer sanitization in gcIfManyNewRefs." am: 3485c844a0
Ivan Lozano [Fri, 3 Nov 2017 04:02:22 +0000 (04:02 +0000)]
Merge "Disable integer sanitization in gcIfManyNewRefs." am: 3485c844a0
am: 55f259d322

Change-Id: I07a0309f01bd5e79cbe0b5b7f77b93c0e1bebec4

6 years agoMerge "Disable integer sanitization in gcIfManyNewRefs."
Ivan Lozano [Fri, 3 Nov 2017 03:53:30 +0000 (03:53 +0000)]
Merge "Disable integer sanitization in gcIfManyNewRefs."
am: 3485c844a0

Change-Id: Iba57b0d2d6f0c611a91db9eddf95f0f147271956

6 years agoMerge "Disable integer sanitization in gcIfManyNewRefs."
Ivan Lozano [Fri, 3 Nov 2017 03:42:24 +0000 (03:42 +0000)]
Merge "Disable integer sanitization in gcIfManyNewRefs."

6 years agoHandle '&' in DexoptUtils#encodeClassLoader
Shubham Ajmera [Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)]
Handle '&' in DexoptUtils#encodeClassLoader

For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.

Removed the secondary dex file dexopt till we fixed it.

(cherry picked from commit 727aaa36b6914be3f340c97c991c93314d25c617)

Bug: 65067046
Test: runtest.py -x \
  frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit 557c054935c0864b42ce49541d12d32ae6a797bc)
Merged-In: I9aa440750c811676c86d8c6d0d451077d0edf5a0
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0

6 years agoMerge "Merge "Added default home values of CDMA roaming indicator" am: a7c51a3d7f...
Jack Yu [Fri, 3 Nov 2017 02:02:06 +0000 (02:02 +0000)]
Merge "Merge "Added default home values of CDMA roaming indicator" am: a7c51a3d7f" into stage-aosp-master
am: 55636146d5

Change-Id: Ic9f26d50bf0059e0bc5330dc12d15eb04caba473

6 years agoMerge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353...
Calin Juravle [Fri, 3 Nov 2017 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353" into stage-aosp-master
am: 2dcee11c41  -s ours

Change-Id: Ia5d6d12e917ac4a4b6cce926b61d300c3feb2541

6 years agoRespect Accessory timeout value when restoring defaults
Selim Gurun [Fri, 3 Nov 2017 01:39:31 +0000 (18:39 -0700)]
Respect Accessory timeout value when restoring defaults

Android accessory mode timeout value is a lot larger than default
timeout value (10 seconds vs. 1 second). The large timeout
value is needed to accomodate for HUs that are not quick
to respond after MTP to Accessory mode change.

Bug: 68819844
Test: Manual
Change-Id: I665e1001f8df66fb00cbfcbf6c58d97c372797fc

6 years agoMerge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353
Calin Juravle [Fri, 3 Nov 2017 01:39:11 +0000 (01:39 +0000)]
Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353
am: c14fcf466a  -s ours

Change-Id: Ib5d2cc1ae84c270ce81bc44f6b413f3288a7b68a

6 years agoMerge "Merge "Added default home values of CDMA roaming indicator" am: a7c51a3d7f...
Android Build Merger (Role) [Fri, 3 Nov 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Merge "Added default home values of CDMA roaming indicator" am: a7c51a3d7f" into stage-aosp-master

6 years agoMerge "Added default home values of CDMA roaming indicator"
Jack Yu [Fri, 3 Nov 2017 01:35:29 +0000 (01:35 +0000)]
Merge "Added default home values of CDMA roaming indicator"
am: a7c51a3d7f

Change-Id: Ia178ace4de625a358f284283fb4a5e5c9b4f7dd4

6 years agoMerge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353...
Android Build Merger (Role) [Fri, 3 Nov 2017 01:31:51 +0000 (01:31 +0000)]
Merge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353" into stage-aosp-master

6 years agoMerge "[framework] Compile secondary dex files in isolation"
Calin Juravle [Fri, 3 Nov 2017 01:30:30 +0000 (01:30 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am: e9e3bfe353

Change-Id: I8f0d9303b3656a298700e26a377d89b7fdd81b4e

6 years agoMerge "[framework] Compile secondary dex files in isolation"
Calin Juravle [Fri, 3 Nov 2017 01:21:27 +0000 (01:21 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am: e9e3bfe353

Change-Id: I7e09a8d5f03b77fa73f13e045e2ec7a2b26eb486

6 years agoMerge "Added default home values of CDMA roaming indicator"
Treehugger Robot [Fri, 3 Nov 2017 01:13:27 +0000 (01:13 +0000)]
Merge "Added default home values of CDMA roaming indicator"

6 years agoAdded missing AutofillEventType so lint doesn't complain.
Felipe Leme [Fri, 3 Nov 2017 01:08:10 +0000 (01:08 +0000)]
Added missing AutofillEventType so lint doesn't complain.
am: 3dec72b601

Change-Id: I858b95d6b94343c5d6c596c30adf4ad6baa772e6

6 years agoMerge "[framework] Compile secondary dex files in isolation"
Treehugger Robot [Fri, 3 Nov 2017 01:05:05 +0000 (01:05 +0000)]
Merge "[framework] Compile secondary dex files in isolation"

6 years agoAdded default home values of CDMA roaming indicator
Jack Yu [Thu, 2 Nov 2017 17:08:10 +0000 (10:08 -0700)]
Added default home values of CDMA roaming indicator

Some carriers use the standard roaming indicator number
assigment for roaming indication. Added the default home values
suggested by 3GPP2 C.R1001 table 8.1-1.

Test: Manual
bug: 67855275
Change-Id: Ib0a613ad8caba74645930f3e5188999be08b2116
(cherry picked from commit cf4a8b40a2ff0496c4ccf08f251c0c425fd673f0)

6 years agoMerge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared" am: eb3bff53f6
Andreas Gampe [Thu, 2 Nov 2017 22:21:57 +0000 (22:21 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared" am: eb3bff53f6
am: 6f8a3cee0e

Change-Id: Ic2399e02d2102f984defb92c29b3568b94ebb244

6 years agoMerge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
Andreas Gampe [Thu, 2 Nov 2017 22:13:37 +0000 (22:13 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
am: eb3bff53f6

Change-Id: I285d7cf715dc0b2e08d7003cecfd92bfc3b9c8da

6 years agoMerge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
Treehugger Robot [Thu, 2 Nov 2017 21:57:29 +0000 (21:57 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"

6 years agoDisable integer sanitization in gcIfManyNewRefs.
Ivan Lozano [Thu, 2 Nov 2017 21:10:57 +0000 (14:10 -0700)]
Disable integer sanitization in gcIfManyNewRefs.

Prevent gcIfManyNewRefs from emitting runtime errors on
integer sanitized builds by disabling unsigned integer overflow
sanitization.

Test: Compiles, device boots.
Bug: 30969751
Change-Id: I90bbf831d03a60b40e047327d633102444058f69

6 years agoAdded missing AutofillEventType so lint doesn't complain.
Felipe Leme [Thu, 2 Nov 2017 20:42:17 +0000 (13:42 -0700)]
Added missing AutofillEventType so lint doesn't complain.

Test: In TreeHugger we trust!
Fixes: 68806712

Change-Id: I2f392161e71e0eca25a4a104b67e7d2982c90341

6 years agoMerge "Fix StateMachine init/quit race." am: 5c7de22a06
con [Thu, 2 Nov 2017 20:28:26 +0000 (20:28 +0000)]
Merge "Fix StateMachine init/quit race." am: 5c7de22a06
am: 1ef2e98a14

Change-Id: If46700cb9701154c97baa8be28457f5fce30ce54

6 years agoMerge "Fix StateMachine init/quit race."
con [Thu, 2 Nov 2017 20:15:35 +0000 (20:15 +0000)]
Merge "Fix StateMachine init/quit race."
am: 5c7de22a06

Change-Id: I26ab138d66366efbcc515e5da0ed21de3e90fa9a

6 years agoMerge "Fix StateMachine init/quit race."
con [Thu, 2 Nov 2017 20:05:09 +0000 (20:05 +0000)]
Merge "Fix StateMachine init/quit race."

6 years agoMerge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive" am...
Andreas Huber [Thu, 2 Nov 2017 19:10:04 +0000 (19:10 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive" am: 80bb035d4e
am: 89ebce3337

Change-Id: Ia3abede66803190d1a6ec4ac141eb851207ce05d

6 years agoMerge changes from topic "explicit_shared_compile_reason_cherrypick" am: 5e5fc34b42
Calin Juravle [Thu, 2 Nov 2017 18:59:16 +0000 (18:59 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick" am: 5e5fc34b42
am: 64e4210099  -s ours

Change-Id: I53aa31310ebf9e1486ad7172e5fd75eb1509ff2d

6 years agoMerge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
Andreas Huber [Thu, 2 Nov 2017 18:58:30 +0000 (18:58 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
am: 80bb035d4e

Change-Id: I35bdd8fe5b80917b8b574e97f10f77df59045efd

6 years agoFix spelling mistake in dumpsys output am: 527a2b205c
Calin Juravle [Thu, 2 Nov 2017 18:55:30 +0000 (18:55 +0000)]
Fix spelling mistake in dumpsys output am: 527a2b205c
am: fa4c521414  -s ours

Change-Id: I36e808545c34205bf2f3c4f4de457ad3999cf1c5

6 years agoMerge "Handle configuration splits when creating the class loader context" am: 88946d4cf2
Calin Juravle [Thu, 2 Nov 2017 18:44:34 +0000 (18:44 +0000)]
Merge "Handle configuration splits when creating the class loader context" am: 88946d4cf2
am: ee41710ef5  -s ours

Change-Id: I3a80cea56b5a310f8c0e9c6eff5586e98fe5df42

6 years agoMerge changes from topic "explicit_shared_compile_reason_cherrypick"
Calin Juravle [Thu, 2 Nov 2017 18:44:10 +0000 (18:44 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick"
am: 5e5fc34b42

Change-Id: I5af5a20cae531d5fc93faae00dfbe399f08da766

6 years agoFix StateMachine init/quit race.
Calvin On [Wed, 1 Nov 2017 20:37:18 +0000 (13:37 -0700)]
Fix StateMachine init/quit race.

The quitNow method places the SM_QUIT_CMD at the front
of the queue. This can cause StateMachine to throw exception
if it has not yet processed the SM_INIT_CMD from start().

Bug: 67370902
Test: make checkbuild
Test: StatMachineTest unittest
Change-Id: I409242845854e70b77ad9b2378b69faed076847c
Merged-In: I7cec7bb91e0447e3c565d33cb7c34ccf59566639

6 years agoFix spelling mistake in dumpsys output
Calin Juravle [Thu, 2 Nov 2017 18:39:26 +0000 (18:39 +0000)]
Fix spelling mistake in dumpsys output
am: 527a2b205c

Change-Id: I3bffb95e459adcf0457479f3b87583ba7600fc03

6 years agoMerge "Ensure dexopt is executed only with consistent package data" am: 1ad0304e7d
Calin Juravle [Thu, 2 Nov 2017 18:34:38 +0000 (18:34 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" am: 1ad0304e7d
am: 1c6eeaec1b  -s ours

Change-Id: I506470013e57b288d54eb5bc308eb79c7c224e69

6 years agoMerge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
Treehugger Robot [Thu, 2 Nov 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"

6 years agoMerge "Handle configuration splits when creating the class loader context"
Calin Juravle [Thu, 2 Nov 2017 18:28:41 +0000 (18:28 +0000)]
Merge "Handle configuration splits when creating the class loader context"
am: 88946d4cf2

Change-Id: I1ed3175ef2094979477dca44b5f0bf56eb34d880

6 years agoMerge "Ensure dexopt is executed only with consistent package data"
Calin Juravle [Thu, 2 Nov 2017 18:24:12 +0000 (18:24 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"
am: 1ad0304e7d

Change-Id: I32a9c3cf57d0726d7959eb331530fab7f79a7619

6 years agoMerge changes from topic "explicit_shared_compile_reason_cherrypick"
Treehugger Robot [Thu, 2 Nov 2017 18:13:54 +0000 (18:13 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick"

* changes:
  Add an explicit reason for the compilation of shared apks
  Fix spelling mistake in dumpsys output

6 years agoMerge "Handle configuration splits when creating the class loader context"
Treehugger Robot [Thu, 2 Nov 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Handle configuration splits when creating the class loader context"

6 years agoMerge "Ensure dexopt is executed only with consistent package data"
Treehugger Robot [Thu, 2 Nov 2017 18:10:42 +0000 (18:10 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"

6 years ago[framework] Compile secondary dex files in isolation
Calin Juravle [Wed, 4 Oct 2017 17:53:09 +0000 (10:53 -0700)]
[framework] Compile secondary dex files in isolation

The class loader context adds the overhead of extracting in-memory and
possibly extra verification which is being frowned upon when the loading
happens on the UI thread. Revert the correct fix of compiling secondary
dex files with their loading context until b/64530081 is done.

Partial revert of commit f1ff36f0f99ebb41d0c7e0f3248506a56998fa3f.

(cherry picked from commit 27f926212483e8291a63884e60fa44de4d0df17c)

Test: adb shell cmd package compile -m quicken -f --secondary-dex
com.google.android.gms
Bug: 64530081
Bug: 66984396
Merged-In: Ib2815ce67b224883fe95c28d1424103e56342c6e
Change-Id: Ib2815ce67b224883fe95c28d1424103e56342c6e

6 years agoPMSCompilerMapping: Hardcode a value for pm.dexopt.shared
Andreas Gampe [Thu, 2 Nov 2017 16:35:28 +0000 (09:35 -0700)]
PMSCompilerMapping: Hardcode a value for pm.dexopt.shared

This is a temporary hack while we sort out the larger issues.

Test: make & flash
Bug: 68755013
Change-Id: I59caf79027dd8be2fd698606822a20b19c0d942a

6 years agoAdd an explicit reason for the compilation of shared apks
Calin Juravle [Fri, 15 Sep 2017 18:09:29 +0000 (11:09 -0700)]
Add an explicit reason for the compilation of shared apks

Some devices might find it more beneficial to compile shared apks like gms
or gms modules with quicken rather then speed.

(cherry picked from commit f53201f8c796e8500b76b72e4fad6269d8547369)

Bug: 65591595
Test: build
Merged-In: I90b79e9f6bc4b4d6b3f5c0b90ab95e8880c4ac9d
Change-Id: I90b79e9f6bc4b4d6b3f5c0b90ab95e8880c4ac9d

6 years agoFix spelling mistake in dumpsys output
Calin Juravle [Tue, 26 Sep 2017 20:23:00 +0000 (13:23 -0700)]
Fix spelling mistake in dumpsys output

(cherry picked from commit 94837e35e3c149e81da90f312fbb37f22c8bc90e)

Bug: 65843255
Test: build
Merged-In: Icc748dd14b52641e37b149f51d61a4086e55ed41
Change-Id: Icc748dd14b52641e37b149f51d61a4086e55ed41

6 years agoHandle configuration splits when creating the class loader context
Calin Juravle [Sat, 2 Sep 2017 00:30:01 +0000 (17:30 -0700)]
Handle configuration splits when creating the class loader context

Configuration splits have no dependencies which can lead to exceptions
when computing their class loader context.

In general, we do not need to compute the class loader context for apks
without code.

This CL addresses the issue by ignoring "code" paths with no actual code.

(cherry picked from commit da09815e2cd3d3968c66a8d52e620ee07d8204dd)

Bug: 65159159
Test: adb install-multiple config_splits
      runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

Merged-In: Ida1eb901eecba4a4266de73022f6ee4659367873
Change-Id: Ida1eb901eecba4a4266de73022f6ee4659367873

6 years agoEnsure dexopt is executed only with consistent package data
Calin Juravle [Fri, 11 Aug 2017 00:23:00 +0000 (17:23 -0700)]
Ensure dexopt is executed only with consistent package data

The main objects bookkeeping packages (PackageParser.Package and its
corresponding ApplicationInfo) may be updated at different times. This
creates a window where the data stored in the ApplicationInfo is out of
date with respect to the data stored in PackageParser.Package.

During install, the two objects are "synced" during doRename which updates
the package code paths.

This CLs moves the dexopt invocation from the install flow after doRename
to ensure that dexopt logic gets a consistent view of the package.

(cherry picked from commit 4c2b9555b7b52359ea14e201d7ec61b8edaf6232)

Bug: 64493351

Test: run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m
CtsAppSecurityHostTestCases
      inspect oat files after
adb install-multiple CtsClassloaderSplitApp/CtsClassloaderSplitApp.apk
    CtsClassloaderSplitAppFeatureA/CtsClassloaderSplitAppFeatureA.apk
    CtsClassloaderSplitAppFeatureB/CtsClassloaderSplitAppFeatureB.apk

Merged-In: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Change-Id: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b

6 years agoZipUtils: Rewrite in terms of zip_archive::Inflate.
Narayan Kamath [Mon, 30 Oct 2017 12:57:24 +0000 (12:57 +0000)]
ZipUtils: Rewrite in terms of zip_archive::Inflate.

Removes duplicated zlib related code.

Bug: 35246701
Test: make
Test: run cts-dev -m CtsContentTestCases -t android.content.res.cts
Change-Id: Ie93cab4eb442b02ee171203a043ef02edbc35f2b

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
Charles He [Thu, 2 Nov 2017 10:58:30 +0000 (10:58 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
am: c214d506d4

Change-Id: I0760ba5c839af8a9dd4b9161dbbad16eacdb3550

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()."
Charles He [Thu, 2 Nov 2017 10:47:31 +0000 (10:47 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."
am: dfe472ecae

Change-Id: Ic0ea2afd4dfc00234b97a66a9dafd993b35dd803

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()."
Charles He [Thu, 2 Nov 2017 10:36:01 +0000 (10:36 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."

6 years agoPreventing recursive referrence in drawables
Sunny Goyal [Thu, 2 Nov 2017 04:46:07 +0000 (04:46 +0000)]
Preventing recursive referrence in drawables
am: 99b25d2817

Change-Id: I1c23d40e590d6d8bb21f6734a106d0ee217b6672

6 years agoPreventing recursive referrence in drawables
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
Preventing recursive referrence in drawables

Bug: 68706673
Bug: 66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies." am: 762f27c6a2
Yifan Hong [Thu, 2 Nov 2017 04:01:07 +0000 (04:01 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies." am: 762f27c6a2
am: 0134fd1577

Change-Id: I9b7b2b45967506469309353eb09c49738805b213

6 years agoMerge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec
Andreas Gampe [Thu, 2 Nov 2017 03:51:58 +0000 (03:51 +0000)]
Merge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec
am: 83419c750f

Change-Id: I78676a68b624813870bd100577969dbbea66b635

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies."
Yifan Hong [Thu, 2 Nov 2017 03:51:08 +0000 (03:51 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."
am: 762f27c6a2

Change-Id: Ia6ebb45cd2e7778483df3c191b3f0d175588e3fc

6 years agoMerge "Frameworks: Fix idle-background-job flag"
Andreas Gampe [Thu, 2 Nov 2017 03:41:49 +0000 (03:41 +0000)]
Merge "Frameworks: Fix idle-background-job flag"
am: 3a16db62ec

Change-Id: Ibb9a6213ccc5f48c848228af3a9c2a73e8309133