Commit Graph

301953 Commits

Author SHA1 Message Date
Svetoslav Ganov
3494413b99 Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f am: 5ac13dcb25
am: 69a039eb78

Change-Id: Id11cb6af6a7e7d9512a3b56efae4832ccfb2f928
2016-10-26 20:46:04 +00:00
Svetoslav Ganov
bc3d8e8673 [DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908
am: c893565d24

Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845
2016-10-26 20:45:07 +00:00
Svetoslav Ganov
69a039eb78 Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f
am: 5ac13dcb25

Change-Id: Ic2950d36ac4f7a32d45e06741e80963f7e1cf583
2016-10-26 20:37:24 +00:00
Svetoslav Ganov
c893565d24 [DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac
am: 2a81b4c908

Change-Id: If6495a817d87c41998cbc148fce7bbb39c4da5a4
2016-10-26 20:36:35 +00:00
Dimitry Ivanov
eb866783c4 Merge "Always call into native loader when load a native library" am: e266c37559 am: 808bd1765f am: 54501b0dee
am: 897d5cf56e

Change-Id: I1087ac78beffa747475306318313ceb84fcd51c7
2016-10-26 20:36:08 +00:00
Dimitry Ivanov
8959c61f69 Always call into native loader when load a native library am: 569834d861 am: 3512d092dd am: 35207ba655
am: 17e1e9d837

Change-Id: If348b1e0ce03ef072e5e7bfe5bbf09c37bfb8f6d
2016-10-26 20:34:35 +00:00
Svetoslav Ganov
5ac13dcb25 Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
am: e9db00e39f

Change-Id: I4141899231b1d48bb8217fe071a4146202e10ab8
2016-10-26 20:28:33 +00:00
Svetoslav Ganov
2a81b4c908 [DO NOT MERGE] Don't accidentally delete renamed packages
am: e2c85890ac

Change-Id: Icbd85ddfc76e50553414bd47860370cdc442b796
2016-10-26 20:28:30 +00:00
Dimitry Ivanov
897d5cf56e Merge "Always call into native loader when load a native library" am: e266c37559 am: 808bd1765f
am: 54501b0dee

Change-Id: Ia07db4ba7b893a577b7d411eaa7fa230b8eb784f
2016-10-26 20:27:23 +00:00
Dimitry Ivanov
17e1e9d837 Always call into native loader when load a native library am: 569834d861 am: 3512d092dd
am: 35207ba655

Change-Id: I56fa597e50da763027aba74d678c40f2b2496b69
2016-10-26 20:25:47 +00:00
Jordan Liu
6c078a439f resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21 am: ff13cc20fe
am: ab3c24ceda  -s ours

Change-Id: I73530234f4ec9aa9146dcd0e5790beb7dd545aa5
2016-10-26 20:24:40 +00:00
TreeHugger Robot
e9db00e39f Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev 2016-10-26 20:22:53 +00:00
Dimitry Ivanov
54501b0dee Merge "Always call into native loader when load a native library" am: e266c37559
am: 808bd1765f

Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070
2016-10-26 20:18:08 +00:00
Jordan Liu
ab3c24ceda resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21
am: ff13cc20fe

Change-Id: I5aea360d11a44b35c781ae32822a559900be34e5
2016-10-26 20:16:42 +00:00
Dimitry Ivanov
35207ba655 Always call into native loader when load a native library am: 569834d861
am: 3512d092dd

Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6
2016-10-26 20:16:38 +00:00
Jordan Liu
ff13cc20fe resolve merge conflicts of ab00546 to stage-aosp-master
am: bc2af49c21

Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
2016-10-26 20:12:56 +00:00
Dimitry Ivanov
808bd1765f Merge "Always call into native loader when load a native library"
am: e266c37559

Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
2016-10-26 20:11:33 +00:00
Dimitry Ivanov
3512d092dd Always call into native loader when load a native library
am: 569834d861

Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
2016-10-26 20:11:01 +00:00
TreeHugger Robot
a917d708e9 Merge "Fix bug in which some Views were not executing enter transition." 2016-10-26 20:07:47 +00:00
Alain Vongsouvanh
63d2e41d1b 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
2016-10-26 13:01:49 -07:00
Winson Chung
cd1ff64683 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
2016-10-26 12:53:01 -07:00
Winson Chung
303c6b78b6 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
2016-10-26 12:49:40 -07:00
TreeHugger Robot
89aa8b9266 Merge "Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager." 2016-10-26 19:40:42 +00:00
TreeHugger Robot
d5dc2d720d Merge "Show up button in select printer activity" 2016-10-26 19:40:10 +00:00
Jordan Liu
bc2af49c21 resolve merge conflicts of ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
2016-10-26 12:05:27 -07:00
Peter Qiu
2a658a152a 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
2016-10-26 11:52:30 -07:00
Peter Qiu
bae4becf69 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
2016-10-26 11:52:24 -07:00
Ecco Park
4fa1ab7029 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>
2016-10-26 11:51:10 -07:00
Dimitry Ivanov
e266c37559 Merge "Always call into native loader when load a native library" 2016-10-26 18:27:38 +00:00
Svetoslav Ganov
e2c85890ac [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
2016-10-26 18:14:06 +00:00
Glen Kuhne
94814570e9 Move wifi.proto to shared service .jar
Changes to ART are causing nano-proto's generated java base classes
to conflict with their duplicates in other projects, leading to a
NullPointerException.

Moving wifi.proto to the same build as other framework service protos in order
for them to share and not generate a duplicate CodedOutputByteBufferNano
classes.

wifi.proto previously lived at:
frameworks/opt/net/wifi/service/proto/wifi.proto

Bug: 32261442
Test: Builds, and existing Unit tests pass
Change-Id: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
2016-10-26 11:04:08 -07:00
TreeHugger Robot
8977c2dcd6 Merge "A little more padding in PrintActivity." 2016-10-26 18:03:55 +00:00
Bill Yi
644a22437f Import translations. DO NOT MERGE
Change-Id: I70ad8db1fffca628251fbeaf6ef98882529a8210
Auto-generated-cl: translation import
2016-10-26 10:55:33 -07:00
Jordan Liu
ab005465b6 Merge "Add key to CarrierConfigManager" 2016-10-26 17:50:45 +00:00
Jorim Jaggi
80900ad35f Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc am: bb139c5633
am: eb7aa4267c

Change-Id: I289ad240e4b78b0705904c2d180821a2e19fd517
2016-10-26 17:49:57 +00:00
Bill Yi
bff09ae3c8 Import translations. DO NOT MERGE
Change-Id: I4b30fe6cf3449cc773ff6ce0e7a896b30248d2ec
Auto-generated-cl: translation import
2016-10-26 10:47:09 -07:00
Jorim Jaggi
eb7aa4267c Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9 am: b5fed003cc
am: bb139c5633

Change-Id: I31d905372f37c3002212d3b7f49144e0b7812269
2016-10-26 17:41:29 +00:00
TreeHugger Robot
6556aa93f2 Merge "Removed old stack member variable in RecentsView" 2016-10-26 17:38:39 +00:00
Jorim Jaggi
bb139c5633 Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9
am: b5fed003cc

Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec
2016-10-26 17:36:55 +00:00
Jorim Jaggi
b5fed003cc Merge "Fix animation sequence for upload tasks"
am: 7f2676a3d9

Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
2016-10-26 17:32:54 +00:00
Jorim Jaggi
7f2676a3d9 Merge "Fix animation sequence for upload tasks" 2016-10-26 17:25:03 +00:00
Rakesh Iyer
31f56e4811 Merge "Make car nav bar center it's children." 2016-10-26 17:24:48 +00:00
Peter Qiu
e557c35d95 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
2016-10-26 10:23:09 -07:00
Philip P. Moltmann
927fefe813 Add UsbDeviceConnection.requestWait with a timeout
Test: Test is submitted alongside this change
Change-Id: I1c46143030a2822ee76676ddc80d3b5c8c62ee80
Fixes: 31288102
2016-10-26 10:21:21 -07:00
Glen Kuhne
0719940ce4 Move ipconnectivity.proto to services-proto.jar
Moved ipconnectivity.proto from services.core.jar to
framework-protos.jar.
Replaced 'mergeFrom' MessageNano base class calls, with 'parseFrom'
IpConnectivityLog calls.

This solves an issue where the services.jar would conflict with
duplicate nano proto base class definitions in other .jars
(wifi-service.jar).

Bug: 32261442
Test: Existing unit tests pass
Change-Id: I49100935fcae2e85e12eaa7f3462864f3a340b97
2016-10-26 10:18:46 -07:00
Android Build Merger (Role)
2fbeaa2745 Merge "Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095 am: 2504343fcd am: 74cd51fef8" 2016-10-26 17:00:03 +00:00
Brad Ebinger
343408a68d Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095 am: 2504343fcd
am: 74cd51fef8

Change-Id: I59c585b74e0b8aec6ede9991e94e00b1752d0b4b
2016-10-26 16:58:41 +00:00
Przemyslaw Szczepaniak
5753515d3d Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9
Test: cts run of CtsLibcoreTestCases
Bug: 29935305
Change-Id: I01465dd11d8ef13d6d47f2dec73100af988edfa1
2016-10-26 17:57:33 +01:00
Vitalii Tomkiv
94cdb8fa0a Merge "Add timeout to usb_device_get_string to prevent usb stuck state for bad behaving devices." 2016-10-26 16:57:25 +00:00
Brad Ebinger
74cd51fef8 Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095
am: 2504343fcd

Change-Id: I8c8919377f1aa953fc798ce8fd431afb25104e78
2016-10-26 16:53:57 +00:00