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

284293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
81d2c05da1 Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp 
am: 9c6e51be17

Change-Id: I04c09e459990f39bed37f6fee0104e741a088a09
 2016-09-06 23:08:52 +00:00
Neil Fuller
c863df5080 Merge changes from topic 'am-620401011b0647ba99518f69310512c1' into nyc-mr1-dev-plus-aosp 
am: 60e7810886

Change-Id: I4133aae0596f587ca0a90595329e3900b1820857
 2016-09-06 23:08:51 +00:00
Andreas Gampe
ab55203a05 Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e 
am: 202e00bec0

Change-Id: Ie44665bb122a7df77e86898ab90b7f34c9569576
 2016-09-06 23:08:49 +00:00
Todd Kennedy
4045f690c9 Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp 
am: c4f7166e19

Change-Id: I1fddc4d7ccc6865763bdc0f4d77d125ddebc342c
 2016-09-06 23:08:42 +00:00
Todd Kennedy
2c20d20e7b Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc 
am: 893fbf87dc

Change-Id: Id8fe805774d5b2cf5e8de803f2994aff5603391f
 2016-09-06 23:08:39 +00:00
Andreas Gampe
2d05455767 Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp 
am: 170cf7938a

Change-Id: Ibca4df1f59e9a71f4d8331886050b9cee147ace1
 2016-09-06 23:08:32 +00:00
Andreas Gampe
d62825e212 OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3 
am: 18d954183a

Change-Id: I01d52c98c8dac491b458ef884750df62c6f3a65a
 2016-09-06 23:08:29 +00:00
Andreas Gampe
466e0bc172 Merge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into nyc-dev-plus-aosp 
am: 1b332aa41f

Change-Id: I497257efebd1b44ab34b577ab25e0334dc982cb1
 2016-09-06 23:08:21 +00:00
Tyler Gunn
f6f880c7d9 Merge "Add toString method for session event codes." into nyc-mr1-dev am: b2e0ed8772 
am: aadc013104

Change-Id: I5b250adacb9161def1f8b33ae937a007349dcd31
 2016-09-06 23:07:24 +00:00
Tyler Gunn
2a9e5263e5 Add toString method for session event codes. am: 6f657ee021 
am: 0e783b6807

Change-Id: I239443075abbc1fa823821d12693a0b50ab7ae52
 2016-09-06 23:07:12 +00:00
Roshan Pius
e597198f12 Merge "WifiConfiguration: Fix isEnterprise" 
am: 9221c96ae0

Change-Id: I439205f4db4bfc292f084ea716014d64353c2885
 2016-09-06 23:02:10 +00:00
Tyler Gunn
aadc013104 Merge "Add toString method for session event codes." into nyc-mr1-dev 
am: b2e0ed8772

Change-Id: Ia2d8d81345b351f45a5d353481ccf60108b6eb50
 2016-09-06 22:54:51 +00:00
Andreas Gampe
0d8ce1dd19 OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c 
am: be1adf2e72  -s ours

Change-Id: I8887b8cde9d1f8de6b3d0cebc71ed24636b2bfcb
 2016-09-06 22:54:44 +00:00
Tyler Gunn
0e783b6807 Add toString method for session event codes. 
am: 6f657ee021

Change-Id: I16263ff0b0b40c4b8bf4071fb1a6076b68c62864
 2016-09-06 22:54:43 +00:00
Lorenzo Colitti
4171cdf303 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] 
(cherry-pick of commit eab17da5882e59caff25c73aa6bcd0587aca9dd4)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
 2016-09-06 15:54:16 -07:00
Etan Cohen
bd9fdbe022 [NAN] Add transport type for NAN. [DO NOT MERGE] 
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7b84987a6acf2f0a950c334a17a6ee085db3ba4f)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
 2016-09-06 15:54:10 -07:00
Treehugger Robot
9221c96ae0 Merge "WifiConfiguration: Fix isEnterprise" 2016-09-06 22:51:43 +00:00
Sreevani Sreejith
80b42055df Merge "Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c" into nyc-dev-plus-aosp 
am: 885368f48e

Change-Id: I360e2248bc07a7a8f706a28ecdd2a85b6a00be38
 2016-09-06 22:48:17 +00:00
Sreevani Sreejith
29ab7d7e60 Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c 
am: 93c66158ce

Change-Id: Ief44746e6abd0e6c1d798d30e9689873a4f81b93
 2016-09-06 22:48:12 +00:00
sreevanis
d4fcdbfc7c Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31" into nyc-dev-plus-aosp 
am: b6933ca1e4

Change-Id: If594f2afddcdbefb47266df93c476e9bd6e8b931
 2016-09-06 22:48:01 +00:00
sreevanis
3e8511ebe3 docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31 
am: 979710ce56

Change-Id: I2addbe41678e35b1a87a72256c09b3e9685808bf
 2016-09-06 22:47:57 +00:00
Tyler Gunn
b2e0ed8772 Merge "Add toString method for session event codes." into nyc-mr1-dev 2016-09-06 22:47:34 +00:00
Andreas Gampe
bf711077c0 Frameworks/base: Add compiler stats to Package Manager am: 7e619a912c am: 723bbd880a 
am: 4cff287df2  -s ours

Change-Id: I35fc442bfcb102d165060beaa6378f0b0e3ba153
 2016-09-06 22:44:34 +00:00
Jaewan Kim
b8ff6a61a6 Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev am: e70f79b584 
am: f3da814415

Change-Id: I3c407a15dc45784d69cdaa267c214cc53bd5c3a6
 2016-09-06 22:41:52 +00:00
Jaewan Kim
512bf0aa25 Keep the PIP at the shifted position when the Settings is shown am: 177801c273 
am: df20aed9f7

Change-Id: I77806cbc2a12759c118e56fa4a91a337e065eb5d
 2016-09-06 22:41:46 +00:00
Calin Juravle
f0036acbfd [RFC] Special case system apps for profile optimizations am: 08313b0d95 am: 788e111cba 
am: 0bc450ac05

Change-Id: I18324f1074a8c62002b88810ffcf61cd2efcd21e
 2016-09-06 22:38:59 +00:00
Mathieu Chartier
e65bf6d173 Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b 
am: 7554be1e36

Change-Id: I4d34ab801e08034c7d54818cc0f313efa88edf69
 2016-09-06 22:38:18 +00:00
Jaewan Kim
f3da814415 Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev 
am: e70f79b584

Change-Id: Ib0c7423c21cd50ab3074357a20d13516c9b287a4
 2016-09-06 22:35:28 +00:00
Jaewan Kim
df20aed9f7 Keep the PIP at the shifted position when the Settings is shown 
am: 177801c273

Change-Id: Ic9cd9ed5213292b54594c26a0fcac93b9262806e
 2016-09-06 22:35:20 +00:00
Calin Juravle
88b02592f4 Compile core-apps according to their own "reason" for A/B am: 9438528d99 am: 54a3247073 
am: 30d58efb59  -s ours

Change-Id: I40353c529dbadfb9f48dc1b7929c8a340f3d1316
 2016-09-06 22:30:34 +00:00
Mathieu Chartier
7554be1e36 Merge "Avoid profile guided compilation for vmSafeMode" 
am: a817838e8b

Change-Id: I5e761bb08c72ed2700cec752caba5a6b02b02015
 2016-09-06 22:30:34 +00:00
Jaewan Kim
e70f79b584 Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev 2016-09-06 22:27:27 +00:00
Bill Yi
dd0e168ca5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 30362824
Change-Id: I089a218f5903bb8c0e9166dd84ea082eecba9470
 2016-09-06 15:19:50 -07:00
Mathieu Chartier
a817838e8b Merge "Avoid profile guided compilation for vmSafeMode" 2016-09-06 22:19:03 +00:00
Andreas Gampe
76c65daa7e Frameworks/base: Add new flow to OtaDexoptService am: d15300cf38 am: 32a092adf3 
am: 2a04b0876f  -s ours

Change-Id: I7776d3ff841eb971ee04d956c28b47e15cf83258
 2016-09-06 22:18:28 +00:00
Jorim Jaggi
affda0ceb5 Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev am: 1191fee634 
am: b1deed973a

Change-Id: Ibfbbb24509ce97aec9c3c60d288cb5bcf78cb73c
 2016-09-06 22:06:57 +00:00
Jorim Jaggi
292a746358 Quicker exit animation for bottom dock on Keyguard am: 48832811b0 
am: 6e690e32a0

Change-Id: Ida90524726d313f3d153945bcd998186fb920655
 2016-09-06 22:06:43 +00:00
Andreas Gampe
d54504020d Merge "resolve merge conflicts of 82f8ebc to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-09-06 22:03:28 +00:00
Jorim Jaggi
b1deed973a Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev 
am: 1191fee634

Change-Id: I68e88e13d89e7184cbbeab9ced910a28b8deaba5
 2016-09-06 22:01:37 +00:00
Jorim Jaggi
6e690e32a0 Quicker exit animation for bottom dock on Keyguard 
am: 48832811b0

Change-Id: Ifd3603c9c41fb475730521452a0326b453e2ce8d
 2016-09-06 22:01:33 +00:00
Andreas Gampe
3976cbc61c resolve merge conflicts of 82f8ebc to nyc-mr1-dev-plus-aosp 
Change-Id: I02322a9a01d3dca7301aba919278a684c6266641
 2016-09-06 15:00:19 -07:00
Neil Fuller
c3e8cbe3b5 Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev am: e3e952148c am: f060c06aec 
am: 4ebf51125e

Change-Id: I55c70fc8c00510098e234731390cc2e9fdbcb923
 2016-09-06 21:59:48 +00:00
Neil Fuller
6b45188589 Fix receive timeout on LocalSocket am: 8d5ec8d7db am: ad54b35d6d 
am: c02c383fc9

Change-Id: I65080d37cae16789606d84eadc9db0415b9a8d09
 2016-09-06 21:58:41 +00:00
Sreevani Sreejith
682937ee67 Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c am: bbc189dd96 am: b8cf0a24ad 
am: abc60347e8

Change-Id: Ifdd0765b8802484699d36eaa7671eb0acb1f945a
 2016-09-06 21:55:00 +00:00
sreevanis
d11548026c docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31 am: bc59fba7d5 am: 8281a41bab 
am: e76f03467f

Change-Id: Ia2c0ae65ba60fcf407024fcfb409628069f07f86
 2016-09-06 21:54:55 +00:00
TreeHugger Robot
1191fee634 Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev 2016-09-06 21:52:51 +00:00
Chad Brubaker
90169caa04 Merge "Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev am: ae76b4eab1 am: 9165701df3" into nyc-mr1-dev-plus-aosp 
am: 2ae9e260bb

Change-Id: I98901287d4a64f6f76460031dec3771d612d422f
 2016-09-06 21:50:29 +00:00
Chad Brubaker
fe936144d9 Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev am: ae76b4eab1 am: 9165701df3 
am: d520c16375

Change-Id: Ie6e4fbccf3f620b34e7eaec98b2e586ba9181976
 2016-09-06 21:50:16 +00:00
Android Build Merger (Role)
60e7810886 Merge changes from topic 'am-620401011b0647ba99518f69310512c1' into nyc-mr1-dev-plus-aosp 
* changes:
  Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev am: e3e952148c am: f060c06aec
  Fix receive timeout on LocalSocket am: 8d5ec8d7db am: ad54b35d6d
 2016-09-06 21:49:49 +00:00
Chad Brubaker
8c1622688c Merge "Avoid NPE on certificates that cannot be read am: 01e9682cab am: 92a534325d" into nyc-mr1-dev-plus-aosp 
am: 5f4b49f91c

Change-Id: I6e2fb1bf31b8732e8e306a741e86601567d5cbfa
 2016-09-06 21:49:47 +00:00