drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,083 Commits 1 Branch 0 Tags
Commit Graph

277083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Brad Ebinger
2504343fcd Merge "Add support for starting external Sessions" am: 4ce60695f9 
am: 9bec1a5095

Change-Id: Ie0b4ca75d34f8489483bd274e7902d3de67703fa
 2016-10-26 16:48:54 +00:00
Brad Ebinger
9bec1a5095 Merge "Add support for starting external Sessions" 
am: 4ce60695f9

Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de
 2016-10-26 16:42:15 +00:00
Brad Ebinger
4ce60695f9 Merge "Add support for starting external Sessions" 2016-10-26 16:34:31 +00:00
Andreas Huber
525489b087 Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 am: 8bd63a39f3 
am: 63f0ebc7a8

Change-Id: I4eeb088c4de6e13f4e939e847dd1ab62b9d91d6a
 2016-10-26 15:58:50 +00:00
Andreas Huber
63f0ebc7a8 Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 
am: 8bd63a39f3

Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062
 2016-10-26 15:54:20 +00:00
Andreas Huber
8bd63a39f3 Merge "Adds support for specifying the version of a service to register/lookup." 
am: c3d8550cf3

Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
 2016-10-26 15:49:52 +00:00
Andreas Huber
c3d8550cf3 Merge "Adds support for specifying the version of a service to register/lookup." 2016-10-26 15:38:45 +00:00
Julius D'souza
f96649a43a Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am: 1e0055bb51 
am: 24dcd11841

Change-Id: I5e61f68e635a8a86b4fa8a1aaafe692431be5b91
 2016-10-26 03:35:16 +00:00
Julius D'souza
58efe25cd7 DO NOT MERGE: Add initial ambient light sensor rate am: 82b9aff0a9 
am: 4d3af80494

Change-Id: Ia54da3fd528bc62c74f607af1e8d45a51bf11918
 2016-10-26 03:34:09 +00:00
Julius D'souza
24dcd11841 Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev 
am: 1e0055bb51

Change-Id: If6b70c76c4e16634175667ca58b69077c5e54c61
 2016-10-26 03:29:49 +00:00
Julius D'souza
4d3af80494 DO NOT MERGE: Add initial ambient light sensor rate 
am: 82b9aff0a9

Change-Id: I65408c700317d76e271659945fe280318dabe315
 2016-10-26 03:29:41 +00:00
Julius D'souza
1e0055bb51 Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev 2016-10-26 03:23:19 +00:00
Zhao Wei Liew
20fbb9cbc0 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
 2016-10-26 02:14:45 +00:00
Julius D'souza
82b9aff0a9 DO NOT MERGE: Add initial ambient light sensor rate 
Bug: 32153559

Change-Id: Ic54bded46f88991290ed1e4d2574f865b6f598ec
 2016-10-25 17:13:29 -07:00
Jorim Jaggi
f2c9eea7ec Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am: 7e8fc05295 am: 66a7dc6193 
am: a03792fb24

Change-Id: Id1d6dfe8fd3a1553fae50601435b50e8746a7565
 2016-10-25 23:55:56 +00:00
Jorim Jaggi
4bcd7ec40b Make sure to call dismissKeyguard after setOccluded am: ec50931d88 am: 1d4f2b9914 
am: ae7f618f38

Change-Id: Ic11164067ce5145771fd0e6f13dcd478c16877f2
 2016-10-25 23:54:55 +00:00
Jorim Jaggi
a03792fb24 Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am: 7e8fc05295 
am: 66a7dc6193

Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c
 2016-10-25 23:48:15 +00:00
Jorim Jaggi
ae7f618f38 Make sure to call dismissKeyguard after setOccluded am: ec50931d88 
am: 1d4f2b9914

Change-Id: I27ef32dfb5963524c0c3efb03058f021799dda07
 2016-10-25 23:47:20 +00:00
Jorim Jaggi
66a7dc6193 Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev 
am: 7e8fc05295

Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11
 2016-10-25 23:39:30 +00:00
Jorim Jaggi
1d4f2b9914 Make sure to call dismissKeyguard after setOccluded 
am: ec50931d88

Change-Id: Ib25480fa4efe63940fed144f4e28dee185244fad
 2016-10-25 23:39:25 +00:00
Jorim Jaggi
7e8fc05295 Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev 2016-10-25 23:32:57 +00:00
Christopher Wiley
a415d687b7 Merge "Add script to expedite running passing tests" am: 4d1c2922f0 am: 2bb707b1c1 
am: c65ca7708a

Change-Id: I77da4757155f028889890e80bb79ba56a8371b86
 2016-10-25 23:14:52 +00:00
Christopher Wiley
c65ca7708a Merge "Add script to expedite running passing tests" am: 4d1c2922f0 
am: 2bb707b1c1

Change-Id: I42f000895fcba0c12c5301578a791ce17668df3d
 2016-10-25 23:10:49 +00:00
Christopher Wiley
2bb707b1c1 Merge "Add script to expedite running passing tests" 
am: 4d1c2922f0

Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6
 2016-10-25 23:06:51 +00:00
Treehugger Robot
4d1c2922f0 Merge "Add script to expedite running passing tests" 2016-10-25 22:58:56 +00:00
Adrian Roos
65bee562c0 Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours am: 299b57410d -s ours 
am: 0d280c5a52  -s ours

Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b
 2016-10-25 22:17:05 +00:00
Adrian Roos
f3ea02119b Ambient: If user turned off ambient, keep it off after split am: 21984eeaf7 -s ours am: 4e2bad2a02 -s ours 
am: cd9c84aff5  -s ours

Change-Id: I7d4316b8cccf4a2cc5106778d2e20ab5d80a8577
 2016-10-25 22:15:56 +00:00
Adrian Roos
0d280c5a52 Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours 
am: 299b57410d  -s ours

Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185
 2016-10-25 22:11:37 +00:00
Adrian Roos
cd9c84aff5 Ambient: If user turned off ambient, keep it off after split am: 21984eeaf7 -s ours 
am: 4e2bad2a02  -s ours

Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8
 2016-10-25 22:10:46 +00:00