Commit Graph

75247 Commits

Author SHA1 Message Date
Jonathan Basseri
cb9dc98cb8 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev
am: 7bd96d32a1

Change-Id: I0566980aa480c50fa785465b08a40ba40d6c7520
2017-10-20 03:01:14 +00:00
Jonathan Basseri
7bd96d32a1 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev 2017-10-20 02:50:35 +00:00
Jonathan Basseri
be530ca671 DO NOT MERGE Revert "Convert ICarrierService to oneway."
This reverts commit 49b54d64ca.

Bug: 63400667
Change-Id: Ica0696bf4ae3f9a84f0e4ad6e1207374696e9497
2017-10-19 19:21:24 +00:00
Benedict Wong
9c6f24d1ee Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024
am: f92bfc3b77

Change-Id: I49932a5fc048b4a60512fac45a3537f050397168
2017-10-19 17:37:22 +00:00
Benedict Wong
f92bfc3b77 Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35
am: d3a5792024

Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18
2017-10-19 17:26:19 +00:00
Benedict Wong
d3a5792024 Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
2017-10-19 17:14:53 +00:00
Benedict Wong
b6df7f0d35 Merge "Add support for AES-GCM-ESP as an IPSec algorithm" 2017-10-19 17:06:30 +00:00
Tobias Thierer
d6e61836ac Merge "Move most android.util.Mutable* classes to framework." am: cd06caf10e am: 4719440f3f
am: 23c2a6578b

Change-Id: I990ecf36ee6d2cd1d55c7cb1e652a8998ff84f35
2017-10-19 16:42:50 +00:00
Tobias Thierer
23c2a6578b Merge "Move most android.util.Mutable* classes to framework." am: cd06caf10e
am: 4719440f3f

Change-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0
2017-10-19 16:31:25 +00:00
Tobias Thierer
4719440f3f Merge "Move most android.util.Mutable* classes to framework."
am: cd06caf10e

Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83
2017-10-19 16:18:44 +00:00
Tobias Thierer
cd06caf10e Merge "Move most android.util.Mutable* classes to framework." 2017-10-19 16:08:07 +00:00
Tobias Thierer
301bf35e2d resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp
Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b
2017-10-19 15:33:17 +00:00
Tobias Thierer
5c9e47d28b Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am: 5f04db96b3
am: 07efe116b1

Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd
2017-10-19 14:34:36 +00:00
Tobias Thierer
07efe116b1 Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am: 5f04db96b3

Change-Id: If85216d03022708787a7218e494434453d5548e3
2017-10-19 14:25:12 +00:00
Tobias Thierer
5f04db96b3 Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" 2017-10-19 14:15:52 +00:00
Svet Ganov
9a7a6e2000 Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev
am: 8f231b7aa6

Change-Id: Id85257c481a7d4e387ffc6ee628bfd2986ab5b3c
2017-10-19 03:26:00 +00:00
Svet Ganov
d96953ad7a Preserve ranking attrs of resolve infos for installing a feature split
If an intent resolves to an activity in a fearture split not on the device
we create a synthetic resolve info to involve the installer that replaces
the resolve info for the missing activity. The synthetic resolve info was
not inheriting the priority/preferred order/default status resulting in a
different result ranking than what original resolve info would produce,
hence affecting resolution. Activities in a feature split should resolve
as if they are present on the device.

Also when downloading a feature split we involve the instant app installer
which resuls in a disabmiguation UI item "Instant app" with an instant app
icon despite that in this case the synthetic resolve info is for downloading
a piece of an already installed app (standard or instant). When installing
a feature spluit the user should see UI as if the piece of the app would
handle the intent.

Test: manual

bug:67710878

Change-Id: I8dd356c7b2c9742144f10e5b48daf5b28f6934ad
2017-10-18 17:29:28 -07:00
Tom Cherry
3fb7276115 Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132d1 am: 9fba6c2fe1
am: 918a29c88d

Change-Id: I29e0ca8d91d29431b498788b548fd48e85d6669b
2017-10-18 19:44:54 +00:00
Tom Cherry
918a29c88d Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132d1
am: 9fba6c2fe1

Change-Id: I17743afca87569e5ef6e17572aec0e8e8e535847
2017-10-18 18:48:55 +00:00
Tom Cherry
9fba6c2fe1 Merge "Allow ro. properties to have arbitrary lengths"
am: 3851f132d1

Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
2017-10-18 18:39:42 +00:00
Benedict Wong
0febe5ece5 Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support

Bug: 63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
2017-10-18 11:22:24 -07:00
Tom Cherry
38a77c4048 Allow ro. properties to have arbitrary lengths
Bug: 23102347
Bug: 34954705
Test: build
Change-Id: I99b074633c60e95cdd2284bf8a708b9187c1e310
2017-10-18 09:25:17 -07:00
Tobias Thierer
49818415eb Move most android.util.Mutable* classes to framework.
android.util is the only package shared between libcore and
framework, with only the Mutable* classes living in libcore.

This CL topic moves most of these classes to framework.
After this CL topic, only MutableInt and MutableLong remain
in libcore. This prevents future libcore dependencies on
android.util; it is a first step towards removing the package
overlap between libcore and framework.

Test: Treehugger
Bug: 67901714

Change-Id: Id466181cb0db747da17f38ddb0b99c3e522add16
2017-10-18 14:53:57 +01:00
Tobias Thierer
6217e37d30 Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.

This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.

Test: Treehugger
Bug: 67901714

Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Merged-In: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
2017-10-18 14:53:57 +01:00
Tom Cherry
3b01d0a09a Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9 am: b72c0626f5
am: 16e676be4b

Change-Id: Ie43c9ec866feba876016c8ceb4c1e5d6222f0a18
2017-10-17 20:04:51 +00:00
Tom Cherry
16e676be4b Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9
am: b72c0626f5

Change-Id: Ib0561d4ce3e027b2021bc6105f0be03ba6fffa99
2017-10-17 19:47:57 +00:00
Tom Cherry
b72c0626f5 Merge "Frameworks: Remove warning for SystemProperties.get"
am: c589496ce9

Change-Id: Ibef1415adec0dac324b0531b7038640c3584fdf1
2017-10-17 19:37:45 +00:00
Tom Cherry
95dd3cef21 Frameworks: Remove warning for SystemProperties.get
We now disallow non-UTF8 property values directly in property_service,
so there is no need for this warning.

This partially reverts 33aea8d40e.

Bug: 63177684
Test: make
Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c
2017-10-17 09:27:23 -07:00
Andrii Kulian
4f4d64659a Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
am: 96da027196

Change-Id: I9f263b5fb407dca34d9ba6d60c7296377b7f44bc
2017-10-16 19:35:20 +00:00
TreeHugger Robot
96da027196 Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev 2017-10-16 18:56:49 +00:00
Abodunrinwa Toki
2a86655b42 Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
am: 14ba6e10c0

Change-Id: I0ddb7b827ad8b0be37c7e1adc5a95493bd35d61f
2017-10-15 02:11:46 +00:00
Andrii Kulian
9d588a7013 DO NOT MERGE: Don't let keyguard to influence orientation when dismissing
When keyguard is being dismissed it still was overriding orientation
for the display, which caused report of wrong configuration to
activity that was becoming visible.

Bug: 66979760
Bug: 36897968
Bug: 62796190
Bug: 62904487
Bug: 38494778
Test: Launch Unity 4 based game, lock and unlock screen, check UI
Test: com.android.server.wm.DisplayContentTests#testOrientationDefinedByKeyguard
Change-Id: I0a180b8e941a85ba4174a40cdec2ff0b8f3e00eb
2017-10-13 18:16:58 +00:00
Abodunrinwa Toki
ba60ab604c Flags to enable/disable smart selection in EditText
1. smart_selection_enabled_for_edit_text
   Disables smart selection for editable text.
2. smart_selection_dark_launch
   Dark launch TextClassifierImpl.suggestSelection(...)
   In this mode we run the method, but never change the user's
   selection to measure the quality of the results based on what
   the user actually wanted.

Bug: 65959640
Test: Manually tested flags turn on/off feature with 'adb shell
settings put global' and GServices override.
Test: bit FrameworksCoreTests:android.provider.SettingsBackupTest
Merged-In: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
Change-Id: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
2017-10-13 16:45:31 +01:00
Patrik Torstensson
7528452f57 Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev
am: 20fb01eb23

Change-Id: Ia6afee63376c98552c3a5a0ee249fa751c3d3603
2017-10-13 07:35:04 +00:00
Patrik Torstensson
20fb01eb23 Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev 2017-10-13 01:30:40 +00:00
Robert Benea
5e099800f8 Incorporate slab reclaimable into meminfo
Instead of using the whole slab mem for kernel usage, split the
unreclaimable to kernel and reclaimable to cache (since is freed
under mem. pressure).

Test: tested on gobo
Bug:67753120
Change-Id: I0f5a310bb88603ad7bb28e5398ea57c249c04fc2
2017-10-13 00:41:47 +00:00
Pankaj Kanwar
975c272419 Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev
am: eb98edfb83

Change-Id: Id45e4e83eadebbe812aa44bdfa5592831813fec9
2017-10-13 00:34:57 +00:00
Pankaj Kanwar
eb98edfb83 Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev 2017-10-13 00:26:11 +00:00
Abodunrinwa Toki
94ab358e5f Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev
am: bc0dc6dcba

Change-Id: Ie40acfeebe656a3551900958ffb84f8897eb44c9
2017-10-13 00:12:43 +00:00
Abodunrinwa Toki
d7a8103be1 DO NOT MERGE Turn off logcat logging for smart selection logs.
Bug: 64914512
Test: none
Change-Id: Ia85f021171a40ebc58bd98020626911961055302
2017-10-12 22:01:13 +01:00
Phil Weaver
73e2acb9ae Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev
am: 15c8747ad9

Change-Id: I1b1c16800319aac6abf8403f168d0b4343293fc0
2017-10-12 01:38:32 +00:00
TreeHugger Robot
15c8747ad9 Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev 2017-10-12 01:24:48 +00:00
Siddharth Ray
3c648c4673 Cleanup of Cellular/Wifi aggregate statistics
Cleanup of Cellular/Wifi aggregate statistics in Batterystats dumpsys

Cellular
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Added power values to Tx power
- Added "Cellular Sleep time"
- Removed erroneous battery field (This is being fixed in b/67213886,
b/67213967)
- Removed the following fields (Mobile radio active unknown time, Mobile
radio active adjusted time, Signal scanning time)

Wifi
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Removed the following field (Wifi on, Wifi running)

BUG:67322291
Change-Id: I9630f154a73c7e3cb4bae4779609302f3674602f
2017-10-11 16:29:53 -07:00
Phil Weaver
9704426d14 Don't recycle replaced nodes in a11y cache
This is a patch for another bug. When the cache refreshes
nodes, it marks the transaction to bypass the cache. We
still, however, replace the cached node. If we recycle
the node as well, we end up refreshing it after it's been
recycled and end up with a sealed node in the cache. That
node can then be obtained and then throw an exception when
a setter is called. These exceptions are almost impossible
to debug.

I'm going to leave the bug open to roll this CL back and
fix the cache's behavior, but this fix seems safer this
late.

Bug: 35626351
Test: Ran a11y CTS and unit tests. Verified on instrumented
master build that the error indeed goes away. Removing one
line from unit tests that requires recycling.

Change-Id: Icc9a43ee49cf7c6bfa996839b35954faaf31621c
2017-10-11 15:51:33 -07:00
Jean-Michel Trivi
47aa351692 Merge "Fix alarm preview volume" into oc-mr1-dev
am: b9629cd432

Change-Id: If5bc5bbdb5239609db61e4706c6b2395b0231f83
2017-10-11 21:48:00 +00:00
TreeHugger Robot
b9629cd432 Merge "Fix alarm preview volume" into oc-mr1-dev 2017-10-11 21:19:54 +00:00
Felipe Leme
705d318485 Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
am: a4dffa032b

Change-Id: I01afae63e1fa5503104244c2e78dfb589697a467
2017-10-11 19:43:34 +00:00
TreeHugger Robot
a4dffa032b Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev 2017-10-11 19:34:45 +00:00
Bernardo Rufino
4229c3fcbd Canonicalize notification channel sounds for backup
am: 2d7a4a3f67

Change-Id: I47c5aba70bd6713f5cd2432b1141d0772fa1e672
2017-10-11 17:50:06 +00:00
Felipe Leme
ed7796f302 Document how to handle save on multi-steps activity.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes: 67650364

Change-Id: Ib9e6c63e537b47a0670fe6bdf5163e8ab80eef0c
2017-10-11 10:13:15 -07:00