Commit Graph

394413 Commits

Author SHA1 Message Date
Mathew Inwood
cdfe54e299 Merge "Include annotation property values in output." 2018-11-30 10:39:43 +00:00
Hyundo Moon
c49b41318a Merge "Rename KeyEvent.isMediaKey() to isMediaSessionKey()" 2018-11-30 10:28:06 +00:00
Mathew Inwood
bd7077065c Include annotation property values in output.
When editing annotations, we want the ability *not* to overwrite any
existing annotation properties already in place. Include any properties
set on the annotation in the output, so that the edit_annotations script
can know that they're there.

The annotation properties are encoded like URL query parameters for
convenience; it makes them easy to encode here & subsequently decode on
the other side (in Python).

Test: m framework-annotation-proc & inpsect output.
Change-Id: I71fb1215ad2790751be336b4955c163bb323a4a6
2018-11-30 09:00:43 +00:00
TreeHugger Robot
0ba5e3d6cb Merge "Making on-screen mic to use VoiceInteraction" 2018-11-30 08:52:27 +00:00
Jimmy Chen
0d7a9a2789 Merge "p2p: WiFi Direct API for Group Creation" 2018-11-30 06:19:21 +00:00
TreeHugger Robot
09c07c3533 Merge "More options to mix floating and nav bar height overlays (1/2)" 2018-11-30 04:57:19 +00:00
Hyundo Moon
9a908db9f4 Rename KeyEvent.isMediaKey() to isMediaSessionKey()
Since not all KEYCODE_MEDIA_* keycodes return true in isMediaKey(),
the naming can give confusion. This CL renames the method to
isMediaSessionKey() and revises its Javadoc.

Bug: 119789707
Test: make -j
Change-Id: I36786ccf5606977e6d971c13d77d950356561bda
2018-11-30 13:54:32 +09:00
Jaewan Kim
c188069fa8 Merge "AML: Make Context#getOpPackageName() public" 2018-11-30 04:49:09 +00:00
TreeHugger Robot
5f0c9331cc Merge "Make AudioManager.FLAG_FROM_KEY as @SystemApi" 2018-11-30 04:03:30 +00:00
TreeHugger Robot
8e1907d610 Merge "Always grant activity recognition permission for location provider" 2018-11-30 02:21:26 +00:00
Matthew Ng
38f7a43d46 More options to mix floating and nav bar height overlays (1/2)
Before slim buttons and floating were mutually exclusive, now they can
both be enabled as overlays so floating with a slim nav height can
occur.

Bug: 112934365
Test: manual
Change-Id: Ic6b3e1216e5395e71c72391f893182e263188572
2018-11-29 17:53:31 -08:00
TreeHugger Robot
c4a8c6d7c2 Merge "Add physical port to DisplayViewport" 2018-11-30 01:49:43 +00:00
Yu-Han Yang
7b84117613 Merge "Support GNSS HAL v2.0 in jni" 2018-11-30 01:34:33 +00:00
TreeHugger Robot
bfb1b7c42a Merge "cheets: Delegate openAppFuseFile operation to vold" 2018-11-30 01:34:21 +00:00
Mill Chen
d53cd4c2d8 Merge "Fix a NPE in ViewRootImpl" 2018-11-30 01:32:58 +00:00
Joe Onorato
2a0e196a54 Merge changes Ibc9ada6f,I2c5fce16
* changes:
  Power model calculation based on batterystats data.
  Parse the raw batterystats into an ActivityReport object.
2018-11-30 01:25:54 +00:00
TreeHugger Robot
8faacd383d Merge "add android.os.Process.getRss()" 2018-11-30 01:16:38 +00:00
Selim Cinek
11cf88e295 Merge "Fade other text out properly when transforming messages" 2018-11-30 00:16:41 +00:00
TreeHugger Robot
83fc1328d7 Merge "Commenting exit condition from read thread." 2018-11-30 00:16:14 +00:00
Sudheer Shanka
2d063858f9 Merge "Add missing permission check in NPMS.setAppIdleWhitelist." 2018-11-30 00:10:25 +00:00
TreeHugger Robot
3e6fb4c8dc Merge "Fixed the inline launch animation for notification groups" 2018-11-30 00:05:39 +00:00
TreeHugger Robot
e59ac13c37 Merge "Revert "Honors MATCH_ALL flag"" 2018-11-29 23:38:29 +00:00
TreeHugger Robot
14ada478f2 Merge "Fix docs" 2018-11-29 23:35:17 +00:00
John Reck
f0732618f0 Merge "Make HWUI's surface Reliable^TM" 2018-11-29 23:23:00 +00:00
James Lemieux
ece2c9497d Merge "Use binary resource support in robolectric" 2018-11-29 23:13:14 +00:00
TreeHugger Robot
f69ca4e970 Merge "Skip writing message field in an atom if it's empty" 2018-11-29 22:52:57 +00:00
Jimmy Chen
ab4a8d2eb7 Merge "p2p: add WifiP2pConfig builder for new API" 2018-11-29 22:37:39 +00:00
TreeHugger Robot
b6005f9ee9 Merge "Fixes incorrect system app deletion logic" 2018-11-29 22:33:29 +00:00
TreeHugger Robot
7762547ce2 Merge "wm: Add ActivityMetricsLaunchObserverRegistry" 2018-11-29 22:23:51 +00:00
Selim Cinek
6487ebffd5 Fixed the inline launch animation for notification groups
When launching a child of a group there would be strange artifacts
from the clipping. These are now fixed. Also made sure that
the notification can't be launched if the parent is translated.

Test: launch child in a group, observe normal animation
Change-Id: Iee8e4b49462e140d3eaffe5b2504caa1b67d04e2
Fixes: 110093221
2018-11-29 21:52:58 +00:00
Chad Brubaker
125970d828 Fix docs
Test: m docs
Bug: N/A
Change-Id: I9dbc83779cdc6918cf22ed60dbc82bba820af06f
2018-11-29 13:50:49 -08:00
James Lemieux
ec3ad9eb13 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsLibRoboTests
Change-Id: I7d0bf6c67377d4e15104f6d1f9ff40bce83df878
2018-11-29 13:47:52 -08:00
Fan Zhang
b36ba90475 Fix a NPE in ViewRootImpl
Fixes: 120229477
Test: make RunSettingsRoboTests -j40
Change-Id: I82f6c5fe5f553399c368bf30eef73b2d7f60d046
2018-11-29 13:45:05 -08:00
Nader Jawad
cce6c22e76 Merge "Hidden API usage Landroid/graphics/Canvas;->mBitmap:Landroid/graphics/Bitmap;" 2018-11-29 21:25:40 +00:00
Patrick Baumann
c1050eea66 Revert "Honors MATCH_ALL flag"
This reverts commit 00e8d59af0.

Reason for revert: unintended consequences

Change-Id: Ia4b16a30ce587d083b80dd08007731f5c68b467d
Bug: 35176630
Fixes: 120214031
2018-11-29 21:20:26 +00:00
TreeHugger Robot
284f8e2531 Merge "v3 keys use SP800 derivation" 2018-11-29 21:03:51 +00:00
TreeHugger Robot
626a973099 Merge changes If2dee6bf,Ifeae68ce,Ib0f7aceb,I79802f91
* changes:
  Add the concept of apps to the battery stats parser.
  Class to parse the raw batterystats csv.
  Add csv parser for the power profile library.
  Off-device library for the power model.
2018-11-29 21:02:10 +00:00
TreeHugger Robot
d930083b07 Merge "Use getPackageUidAsUser in TextClassificationManagerService" 2018-11-29 20:53:27 +00:00
Lucas Dupin
54ff93c6b2 Merge "Ambient wallpaper API feedback" 2018-11-29 20:44:13 +00:00
Paul McLean
0d8753073a Commenting exit condition from read thread.
Silence spurious exception error reporting.

Test: Run CTS and CTSVerifier Midi tests.
Bug: 114123487
Bug: 120225301

Change-Id: I82b13e563c30ba42e02625cfe57bd27897cb8035
2018-11-29 13:43:22 -07:00
Roshan Pius
f8d769ef29 Merge changes from topics "system_api_setup_wizard", "deprecate_apis"
* changes:
  WifiManager: Mark all settings/setupwizard custom APIs @SystemApi
  WifiManager: Deprecate API implementation
2018-11-29 20:41:20 +00:00
TreeHugger Robot
c489b375cc Merge "WifiScanner: Add location permission & app-ops checks" 2018-11-29 20:39:33 +00:00
John Reck
fd45bee176 Merge "Add a unique ID to rendernode" 2018-11-29 20:39:08 +00:00
Patrick Baumann
f7e31e6de7 Fixes incorrect system app deletion logic
This change corrects a bad boolean check made in a recent refactor that
was causing non-child system packages to be treated as system packages.
It also bypasses the may delete check for replacing system apps as these
are not deleted the same as non-system.

Change-Id: If43a6d019deb0f203a5cfd2c33e02679b05899f3
Fixes: 120213570
Fixes: 120186133
Test: system updates are successful
2018-11-29 12:23:45 -08:00
TreeHugger Robot
362a3caaf1 Merge "Make Drawable#isProjected public" 2018-11-29 20:21:27 +00:00
Chad Brubaker
1a4c431e26 Merge "Add permission usage information" 2018-11-29 20:10:41 +00:00
Sudheer Shanka
db02ccda58 Add missing permission check in NPMS.setAppIdleWhitelist.
Bug: 120220390
Test: atest CtsHostsideNetworkTests
Change-Id: I9032c2f1ddd49029407fc37395ca8c02d4daca13
2018-11-29 11:53:58 -08:00
TreeHugger Robot
da6e447f2a Merge "Update B&R owners" 2018-11-29 19:53:39 +00:00
TreeHugger Robot
fc14d79671 Merge "Set visibility of buttons to Gone in entity header" 2018-11-29 19:45:03 +00:00
Adam He
103e62a19f Merge "Added 8th and 9th argument to pooled lambdas" 2018-11-29 19:32:54 +00:00