OSDN Git Service

android-x86/frameworks-base.git
7 years agoAdd check for null manger for a11y recents action
Phil Weaver [Thu, 3 Nov 2016 22:28:03 +0000 (15:28 -0700)]
Add check for null manger for a11y recents action

Bug: 31986988

Test: Ran A11y cts
Change-Id: Ia6a1e1b921d8b0008edbcf1f1a8d1d3d0eb969c6

7 years agoMerge "No recents items can be dismissed by tap or swipe"
TreeHugger Robot [Wed, 26 Oct 2016 23:45:19 +0000 (23:45 +0000)]
Merge "No recents items can be dismissed by tap or swipe"

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058...
Peter Qiu [Wed, 26 Oct 2016 23:03:08 +0000 (23:03 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058 am: bb8f3a3bbf am: e6effcd7a6
am: a01e6667d9

Change-Id: I555251fc739284af57179dfac48a4fb46c5a2a59

7 years agoMerge changes I69c1931b,I6b08f52d am: 1a5da2b533 am: fe4f473fb8 am: f300e2f8ff
Peter Qiu [Wed, 26 Oct 2016 23:01:21 +0000 (23:01 +0000)]
Merge changes I69c1931b,I6b08f52d am: 1a5da2b533 am: fe4f473fb8 am: f300e2f8ff
am: 0af8599174

Change-Id: I79b24ea210d490be3f2926c515446625a0e3625e

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69...
Peter Qiu [Wed, 26 Oct 2016 22:59:46 +0000 (22:59 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69 am: 2fb7775d2a am: 90e40ee843
am: e07f54e0b1

Change-Id: I381912a511089fd55f010806f75915c5989a66f7

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95 am...
Peter Qiu [Wed, 26 Oct 2016 22:58:22 +0000 (22:58 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95 am: 6f426e3b17 am: 47047555bc
am: a465821df8

Change-Id: I97ec6baa738f65ea3fa55e4d80b2008da7ac308a

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058...
Peter Qiu [Wed, 26 Oct 2016 22:54:15 +0000 (22:54 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058 am: bb8f3a3bbf
am: e6effcd7a6

Change-Id: Id9358a0d3f821c201563ea072cc6784125fac591

7 years agoMerge changes I69c1931b,I6b08f52d am: 1a5da2b533 am: fe4f473fb8
Peter Qiu [Wed, 26 Oct 2016 22:52:36 +0000 (22:52 +0000)]
Merge changes I69c1931b,I6b08f52d am: 1a5da2b533 am: fe4f473fb8
am: f300e2f8ff

Change-Id: I51abbd1d96aaf2ed5d99737cdd452de3c34fbe35

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69...
Peter Qiu [Wed, 26 Oct 2016 22:50:53 +0000 (22:50 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69 am: 2fb7775d2a
am: 90e40ee843

Change-Id: I45b4b70582252d680648a996b5e95e998f41afe2

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95 am...
Peter Qiu [Wed, 26 Oct 2016 22:49:43 +0000 (22:49 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95 am: 6f426e3b17
am: 47047555bc

Change-Id: I381096b9e6243b10e0e4cea4f31ef058c07054fb

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058
Peter Qiu [Wed, 26 Oct 2016 22:44:44 +0000 (22:44 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058
am: bb8f3a3bbf

Change-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da

7 years agoMerge changes I69c1931b,I6b08f52d am: 1a5da2b533
Peter Qiu [Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)]
Merge changes I69c1931b,I6b08f52d am: 1a5da2b533
am: fe4f473fb8

Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69
Peter Qiu [Wed, 26 Oct 2016 22:41:48 +0000 (22:41 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69
am: 2fb7775d2a

Change-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95
Peter Qiu [Wed, 26 Oct 2016 22:40:43 +0000 (22:40 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95
am: 6f426e3b17

Change-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Peter Qiu [Wed, 26 Oct 2016 22:30:37 +0000 (22:30 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am: ef0cc62058

Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08

7 years agoMerge changes I69c1931b,I6b08f52d
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am: 1a5da2b533

Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
Peter Qiu [Wed, 26 Oct 2016 22:28:55 +0000 (22:28 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am: bae4becf69

Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9

7 years agoMerge "CarrierConfig: add persist_lpp_mode_bool"
TreeHugger Robot [Wed, 26 Oct 2016 22:14:44 +0000 (22:14 +0000)]
Merge "CarrierConfig: add persist_lpp_mode_bool"

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"

7 years agoMerge changes I69c1931b,I6b08f52d
Treehugger Robot [Wed, 26 Oct 2016 22:13:57 +0000 (22:13 +0000)]
Merge changes I69c1931b,I6b08f52d

* changes:
  wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
  wifi: hotspot2: initial implementation of PasspointConfiguration

7 years agoMerge "Properly set the center of the circular mask." into cw-f-dev am: 7aa48283b0...
Alain Vongsouvanh [Wed, 26 Oct 2016 22:10:47 +0000 (22:10 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev am: 7aa48283b0 am: db82c3fc46
am: 9c66337d85

Change-Id: I441284c9b8dca04d5526edd9bbbae779322b9dea

7 years agoProperly set the center of the circular mask. am: 63d2e41d1b am: 285cf2d765
Alain Vongsouvanh [Wed, 26 Oct 2016 22:09:46 +0000 (22:09 +0000)]
Properly set the center of the circular mask. am: 63d2e41d1b am: 285cf2d765
am: bac23b4fda  -s ours

Change-Id: I9725217b2367be6876e1f91deea5762f6148c8ba

7 years agoMerge changes I2d9f1a2d,I01fd8ba6
TreeHugger Robot [Wed, 26 Oct 2016 21:48:06 +0000 (21:48 +0000)]
Merge changes I2d9f1a2d,I01fd8ba6

* changes:
  Ensure PIP retains bounds on device rotation.
  Fix wrong bounds being used in landscape.

7 years agoMerge "Properly set the center of the circular mask." into cw-f-dev am: 7aa48283b0
Alain Vongsouvanh [Wed, 26 Oct 2016 21:34:40 +0000 (21:34 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev am: 7aa48283b0
am: db82c3fc46

Change-Id: I2f50ee1a68da4501e29bca9848d60abce11ea7e7

7 years agoProperly set the center of the circular mask. am: 63d2e41d1b
Alain Vongsouvanh [Wed, 26 Oct 2016 21:33:44 +0000 (21:33 +0000)]
Properly set the center of the circular mask. am: 63d2e41d1b
am: 285cf2d765

Change-Id: I7ebd39225bff8740d486d38f4668eeb8fd83da56

7 years agoMerge "Properly set the center of the circular mask." into cw-f-dev
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:19 +0000 (21:29 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev
am: 7aa48283b0

Change-Id: Ie54889ebded4a26ee20807f06d5832851eb941f0

7 years agoProperly set the center of the circular mask.
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:15 +0000 (21:29 +0000)]
Properly set the center of the circular mask.
am: 63d2e41d1b

Change-Id: If638998c5012b5ebb68cca77b257a991b09827a9

7 years agoNo recents items can be dismissed by tap or swipe
Matthew Ng [Fri, 21 Oct 2016 21:53:18 +0000 (14:53 -0700)]
No recents items can be dismissed by tap or swipe

When there are no recents items shown, any tap or swipe will dismiss it
and go back to the launcher.

Bug: 31464845
Fixes: 31464845
Test: manual - overview with no recents and tap the screen to dismiss
Change-Id: I98987daf4d064e3f65141f790e68018fcf445c26

7 years agoMerge "Properly set the center of the circular mask." into cw-f-dev
TreeHugger Robot [Wed, 26 Oct 2016 21:20:20 +0000 (21:20 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev

7 years agoMerge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev...
Svetoslav Ganov [Wed, 26 Oct 2016 20:53:51 +0000 (20:53 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f am: 5ac13dcb25 am: 69a039eb78
am: 3494413b99  -s ours

Change-Id: If807066cabe2fee34fe1e2bcc5d76a4a1106fe3b

7 years ago[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c9...
Svetoslav Ganov [Wed, 26 Oct 2016 20:53:04 +0000 (20:53 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908 am: c893565d24
am: bc3d8e8673  -s ours

Change-Id: I9b6cff17aa4e62c17d25ebb747891a83a3e2c67a

7 years agoMerge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev...
Svetoslav Ganov [Wed, 26 Oct 2016 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f am: 5ac13dcb25
am: 69a039eb78

Change-Id: Id11cb6af6a7e7d9512a3b56efae4832ccfb2f928

7 years ago[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908
Svetoslav Ganov [Wed, 26 Oct 2016 20:45:07 +0000 (20:45 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908
am: c893565d24

Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845

7 years agoMerge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev...
Svetoslav Ganov [Wed, 26 Oct 2016 20:37:24 +0000 (20:37 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f
am: 5ac13dcb25

Change-Id: Ic2950d36ac4f7a32d45e06741e80963f7e1cf583

7 years ago[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac
Svetoslav Ganov [Wed, 26 Oct 2016 20:36:35 +0000 (20:36 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac
am: 2a81b4c908

Change-Id: If6495a817d87c41998cbc148fce7bbb39c4da5a4

7 years agoMerge "Always call into native loader when load a native library" am: e266c37559...
Dimitry Ivanov [Wed, 26 Oct 2016 20:36:08 +0000 (20:36 +0000)]
Merge "Always call into native loader when load a native library" am: e266c37559 am: 808bd1765f am: 54501b0dee
am: 897d5cf56e

Change-Id: I1087ac78beffa747475306318313ceb84fcd51c7

7 years agoAlways call into native loader when load a native library am: 569834d861 am: 3512d092...
Dimitry Ivanov [Wed, 26 Oct 2016 20:34:35 +0000 (20:34 +0000)]
Always call into native loader when load a native library am: 569834d861 am: 3512d092dd am: 35207ba655
am: 17e1e9d837

Change-Id: If348b1e0ce03ef072e5e7bfe5bbf09c37bfb8f6d

7 years agoMerge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:33 +0000 (20:28 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
am: e9db00e39f

Change-Id: I4141899231b1d48bb8217fe071a4146202e10ab8

7 years ago[DO NOT MERGE] Don't accidentally delete renamed packages
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:30 +0000 (20:28 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages
am: e2c85890ac

Change-Id: Icbd85ddfc76e50553414bd47860370cdc442b796

7 years agoMerge "Always call into native loader when load a native library" am: e266c37559...
Dimitry Ivanov [Wed, 26 Oct 2016 20:27:23 +0000 (20:27 +0000)]
Merge "Always call into native loader when load a native library" am: e266c37559 am: 808bd1765f
am: 54501b0dee

Change-Id: Ia07db4ba7b893a577b7d411eaa7fa230b8eb784f

7 years agoAlways call into native loader when load a native library am: 569834d861 am: 3512d092dd
Dimitry Ivanov [Wed, 26 Oct 2016 20:25:47 +0000 (20:25 +0000)]
Always call into native loader when load a native library am: 569834d861 am: 3512d092dd
am: 35207ba655

Change-Id: I56fa597e50da763027aba74d678c40f2b2496b69

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21 am: ff13cc20fe
Jordan Liu [Wed, 26 Oct 2016 20:24:40 +0000 (20:24 +0000)]
resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21 am: ff13cc20fe
am: ab3c24ceda  -s ours

Change-Id: I73530234f4ec9aa9146dcd0e5790beb7dd545aa5

7 years agoMerge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
TreeHugger Robot [Wed, 26 Oct 2016 20:22:49 +0000 (20:22 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev

7 years agoMerge "Always call into native loader when load a native library" am: e266c37559
Dimitry Ivanov [Wed, 26 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Always call into native loader when load a native library" am: e266c37559
am: 808bd1765f

Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21
Jordan Liu [Wed, 26 Oct 2016 20:16:42 +0000 (20:16 +0000)]
resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21
am: ff13cc20fe

Change-Id: I5aea360d11a44b35c781ae32822a559900be34e5

7 years agoAlways call into native loader when load a native library am: 569834d861
Dimitry Ivanov [Wed, 26 Oct 2016 20:16:38 +0000 (20:16 +0000)]
Always call into native loader when load a native library am: 569834d861
am: 3512d092dd

Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master
Jordan Liu [Wed, 26 Oct 2016 20:12:56 +0000 (20:12 +0000)]
resolve merge conflicts of ab00546 to stage-aosp-master
am: bc2af49c21

Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7

7 years agoMerge "Always call into native loader when load a native library"
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:33 +0000 (20:11 +0000)]
Merge "Always call into native loader when load a native library"
am: e266c37559

Change-Id: I4d220cde19ac85b16396070f493395227a85d82c

7 years agoAlways call into native loader when load a native library
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Always call into native loader when load a native library
am: 569834d861

Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104

7 years agoMerge "Fix bug in which some Views were not executing enter transition."
TreeHugger Robot [Wed, 26 Oct 2016 20:07:43 +0000 (20:07 +0000)]
Merge "Fix bug in which some Views were not executing enter transition."

7 years agoProperly set the center of the circular mask.
Alain Vongsouvanh [Wed, 26 Oct 2016 20:01:49 +0000 (13:01 -0700)]
Properly set the center of the circular mask.

The new circular mask did not take into account devices with a chin,
setting the center of the circular mask higher than it should be.

BUG: 32418552
Change-Id: Ia45e197492a57341ad7db620b1d3fcc4820eabf0

7 years agoEnsure PIP retains bounds on device rotation.
Winson Chung [Wed, 26 Oct 2016 16:44:43 +0000 (09:44 -0700)]
Ensure PIP retains bounds on device rotation.

- When device rotates, ensure that the PIP continues to show in the
  same aspect ratio, snapped to the same logical snap point.
- Move common snapping code to policy so that it can be shared between
  SystemUI and the framework.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackInBoundsAfterRotation

Change-Id: I2d9f1a2dc077a55c39acc1ccba982c255e2ff3a4

7 years agoFix wrong bounds being used in landscape.
Winson Chung [Tue, 25 Oct 2016 00:12:49 +0000 (17:12 -0700)]
Fix wrong bounds being used in landscape.

- Ensure we use the right display size when calculating PIP bounds.
- Also update interface to take the display id.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackDefaultBounds
Test: #testPinnedStackMovementBounds

Change-Id: I01fd8ba6dee212c29a9a092673ee8f7843e41af6

7 years agoMerge "Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager."
TreeHugger Robot [Wed, 26 Oct 2016 19:40:40 +0000 (19:40 +0000)]
Merge "Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager."

7 years agoMerge "Show up button in select printer activity"
TreeHugger Robot [Wed, 26 Oct 2016 19:40:07 +0000 (19:40 +0000)]
Merge "Show up button in select printer activity"

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master
Jordan Liu [Wed, 26 Oct 2016 18:24:54 +0000 (11:24 -0700)]
resolve merge conflicts of ab00546 to stage-aosp-master

Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49

7 years agowifi: hotspot2: omadm: add parsing support for PPS MO tree
Peter Qiu [Tue, 18 Oct 2016 19:04:23 +0000 (12:04 -0700)]
wifi: hotspot2: omadm: add parsing support for PPS MO tree

This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.

Bug: 32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
Peter Qiu [Fri, 14 Oct 2016 21:26:46 +0000 (14:26 -0700)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string

The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.

Bug: 32129686
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a

7 years agoCarrierConfig: add persist_lpp_mode_bool
Ecco Park [Mon, 24 Oct 2016 20:04:52 +0000 (13:04 -0700)]
CarrierConfig: add persist_lpp_mode_bool

Removing carrier specific function from
GnssLocationProvider.java

This property is used for persisting the current
lpp_mode of carrier even after sim is removed

Instead, we will use the property of carrier config

Bug: 32250938

Change-Id: Ibc69883723392cb0fbfcd8dbf3e866860db9dd5d
Signed-off-by: Ecco Park <eccopark@google.com>
7 years agoMerge "Always call into native loader when load a native library"
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"

7 years ago[DO NOT MERGE] Don't accidentally delete renamed packages
Svetoslav Ganov [Wed, 26 Oct 2016 03:47:15 +0000 (20:47 -0700)]
[DO NOT MERGE] Don't accidentally delete renamed packages

Apps on the system image can change their package by declaring
their old one in the manifest. If a package is renamed it is
internally referred by its old name.

The reconciliation code was using the new package name for
renamed packages and was concluding the apk is orphaned thus
deleting it. This puts the package in a bad state where the app
is gone and the version on the system partition is disabled.

Also Play was showing an update for a renamed system app as
an install while it is an update because of the same reason,
it was using the new package name while the app is internally
referred by the old one.

The fix for both above is to internally normalize the package
name by using the old one if the package was renamed or the
package name as is.

Test: With the fix put the old calculator on the system image
and booted, then put the renamed calculator and booted, updated
calculator from play and rebooted - calculator keeps working.
Also did the above steps without the patch to put calculator
in a bad state and flashed the system with the patch which
fixed the broken calculator app.

bug:32321269

Change-Id: I98bfc05c399edfc9854ebcce44182fefa55ceeff

7 years agoMerge "A little more padding in PrintActivity."
TreeHugger Robot [Wed, 26 Oct 2016 18:03:52 +0000 (18:03 +0000)]
Merge "A little more padding in PrintActivity."

7 years agoMerge "Add key to CarrierConfigManager"
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"

7 years agoMerge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc am...
Jorim Jaggi [Wed, 26 Oct 2016 17:49:57 +0000 (17:49 +0000)]
Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc am: bb139c5633
am: eb7aa4267c

Change-Id: I289ad240e4b78b0705904c2d180821a2e19fd517

7 years agoMerge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc
Jorim Jaggi [Wed, 26 Oct 2016 17:41:29 +0000 (17:41 +0000)]
Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc
am: bb139c5633

Change-Id: I31d905372f37c3002212d3b7f49144e0b7812269

7 years agoMerge "Removed old stack member variable in RecentsView"
TreeHugger Robot [Wed, 26 Oct 2016 17:38:36 +0000 (17:38 +0000)]
Merge "Removed old stack member variable in RecentsView"

7 years agoMerge "Fix animation sequence for upload tasks" am: 7f2676a3d9
Jorim Jaggi [Wed, 26 Oct 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9
am: b5fed003cc

Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec

7 years agoMerge "Fix animation sequence for upload tasks"
Jorim Jaggi [Wed, 26 Oct 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix animation sequence for upload tasks"
am: 7f2676a3d9

Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b

7 years agoMerge "Fix animation sequence for upload tasks"
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"

7 years agoMerge "Make car nav bar center it's children."
Rakesh Iyer [Wed, 26 Oct 2016 17:24:45 +0000 (17:24 +0000)]
Merge "Make car nav bar center it's children."

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
Peter Qiu [Thu, 29 Sep 2016 17:44:15 +0000 (10:44 -0700)]
wifi: hotspot2: initial implementation of PasspointConfiguration

Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.

These classes are used for data exchanges between the app and the system
service (WifiService).  All the business logics and validations will be
done on the service side (WifiService).

Bug: 31813706
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532

7 years agoMerge "Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a50...
Android Build Merger (Role) [Wed, 26 Oct 2016 17:00:00 +0000 (17:00 +0000)]
Merge "Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095 am: 2504343fcd am: 74cd51fef8"

7 years agoMerge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095...
Brad Ebinger [Wed, 26 Oct 2016 16:58:41 +0000 (16:58 +0000)]
Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095 am: 2504343fcd
am: 74cd51fef8

Change-Id: I59c585b74e0b8aec6ede9991e94e00b1752d0b4b

7 years agoMerge "Add timeout to usb_device_get_string to prevent usb stuck state for bad behavi...
Vitalii Tomkiv [Wed, 26 Oct 2016 16:57:21 +0000 (16:57 +0000)]
Merge "Add timeout to usb_device_get_string to prevent usb stuck state for bad behaving devices."

7 years agoMerge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095
Brad Ebinger [Wed, 26 Oct 2016 16:53:57 +0000 (16:53 +0000)]
Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095
am: 2504343fcd

Change-Id: I8c8919377f1aa953fc798ce8fd431afb25104e78

7 years agoMerge "Add support for starting external Sessions" am: 4ce60695f9
Brad Ebinger [Wed, 26 Oct 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add support for starting external Sessions" am: 4ce60695f9
am: 9bec1a5095

Change-Id: Ie0b4ca75d34f8489483bd274e7902d3de67703fa

7 years agoMerge "Add support for starting external Sessions"
Brad Ebinger [Wed, 26 Oct 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Add support for starting external Sessions"
am: 4ce60695f9

Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de

7 years agoMerge "Add support for starting external Sessions"
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"

7 years agoA little more padding in PrintActivity.
Philip P. Moltmann [Wed, 26 Oct 2016 16:26:43 +0000 (09:26 -0700)]
A little more padding in PrintActivity.

Test: Looked at rendering
Change-Id: If5778ca433f4b7e87bfa8ab2f2b0256042ce1a50

7 years agoShow up button in select printer activity
Philip P. Moltmann [Wed, 26 Oct 2016 16:15:26 +0000 (09:15 -0700)]
Show up button in select printer activity

Test: Selected a printer via select printer activity
      Pressed up button in select printer activity (no printer get
      selected)

Change-Id: Ifcd133eb0ceb973464cbd35b6ee87c9f09221af4

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."...
Andreas Huber [Wed, 26 Oct 2016 16:03:29 +0000 (16:03 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 am: 8bd63a39f3 am: 63f0ebc7a8
am: 525489b087

Change-Id: I00eb3f6e26fbb01592d09d581488a903f17a4fa4

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."...
Andreas Huber [Wed, 26 Oct 2016 15:58:50 +0000 (15:58 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 am: 8bd63a39f3
am: 63f0ebc7a8

Change-Id: I4eeb088c4de6e13f4e939e847dd1ab62b9d91d6a

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."...
Andreas Huber [Wed, 26 Oct 2016 15:54:20 +0000 (15:54 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3
am: 8bd63a39f3

Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
Andreas Huber [Wed, 26 Oct 2016 15:49:52 +0000 (15:49 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
am: c3d8550cf3

Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
Andreas Huber [Wed, 26 Oct 2016 15:38:44 +0000 (15:38 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."

7 years agoMerge "Make TextViewActivityTests MediumTests"
Abodunrinwa Toki [Wed, 26 Oct 2016 15:26:30 +0000 (15:26 +0000)]
Merge "Make TextViewActivityTests MediumTests"

7 years agoMove OpenGL specific details behind renderPipeline interface.
Derek Sollenberger [Tue, 25 Oct 2016 16:09:18 +0000 (12:09 -0400)]
Move OpenGL specific details behind renderPipeline interface.

Test: new and existing unit tests still pass.
Change-Id: I6164f30f45ebe450788ed8d949eca5af9a44e585

7 years agoMerge "Store GrContext on RenderThread for use by Skia-based renderers."
Derek Sollenberger [Wed, 26 Oct 2016 12:46:28 +0000 (12:46 +0000)]
Merge "Store GrContext on RenderThread for use by Skia-based renderers."

7 years agoMerge "Make FrameInfoVisualizer use an IRenderPipeline to draw"
Matt Sarett [Wed, 26 Oct 2016 12:23:25 +0000 (12:23 +0000)]
Merge "Make FrameInfoVisualizer use an IRenderPipeline to draw"

7 years agoMerge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am: 1e0055b...
Julius D'souza [Wed, 26 Oct 2016 03:43:51 +0000 (03:43 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am: 1e0055bb51 am: 24dcd11841
am: f96649a43a  -s ours

Change-Id: Ic7be3698a35f311bd9df66415a9cc6659fb46bcf

7 years agoDO NOT MERGE: Add initial ambient light sensor rate am: 82b9aff0a9 am: 4d3af80494
Julius D'souza [Wed, 26 Oct 2016 03:42:51 +0000 (03:42 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate am: 82b9aff0a9 am: 4d3af80494
am: 58efe25cd7  -s ours

Change-Id: If9c5ec885dd2994c1c541a3621c60639e5fd4e4f

7 years agoMerge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am: 1e0055bb51
Julius D'souza [Wed, 26 Oct 2016 03:35:16 +0000 (03:35 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am: 1e0055bb51
am: 24dcd11841

Change-Id: I5e61f68e635a8a86b4fa8a1aaafe692431be5b91

7 years agoDO NOT MERGE: Add initial ambient light sensor rate am: 82b9aff0a9
Julius D'souza [Wed, 26 Oct 2016 03:34:09 +0000 (03:34 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate am: 82b9aff0a9
am: 4d3af80494

Change-Id: Ia54da3fd528bc62c74f607af1e8d45a51bf11918

7 years agoMerge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
Julius D'souza [Wed, 26 Oct 2016 03:29:49 +0000 (03:29 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
am: 1e0055bb51

Change-Id: If6b70c76c4e16634175667ca58b69077c5e54c61

7 years agoDO NOT MERGE: Add initial ambient light sensor rate
Julius D'souza [Wed, 26 Oct 2016 03:29:41 +0000 (03:29 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate
am: 82b9aff0a9

Change-Id: I65408c700317d76e271659945fe280318dabe315

7 years agoMerge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
Julius D'souza [Wed, 26 Oct 2016 03:23:17 +0000 (03:23 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev

7 years agoFix animation sequence for upload tasks
Zhao Wei Liew [Mon, 14 Sep 2015 13:41:57 +0000 (21:41 +0800)]
Fix animation sequence for upload tasks

stat_sys_upload_anim2 and stat_sys_upload_anim1 are reversed,
resulting in an animation that jumps from one frame to the
following frame and back again.

Change-Id: Ibb9c6c4ff992895dce26a283f1ee9a81f7cdee15

7 years agoMerge "tv.input: Updating tv input hal client with hidl."
TreeHugger Robot [Wed, 26 Oct 2016 00:46:59 +0000 (00:46 +0000)]
Merge "tv.input: Updating tv input hal client with hidl."

7 years agoMake car nav bar center it's children.
Victor Chan [Tue, 23 Aug 2016 18:33:18 +0000 (11:33 -0700)]
Make car nav bar center it's children.

The linear layout that represents the buttons in the nav bar are added
programatically. Its xml layout values are overwritten, so set the
gravity to to center in its parent to ensure the buttons are always
centered.

Change-Id: Id4d380e8010e316907bc31f0ee6bc8d4624c6667
(cherry picked from commit 288c1c41d5784ba0f5912709b3101abcd8cd7e2a)