Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
270,227 Commits 3 Branches 0 Tags
594b71ca62f4ea3255fd33cad198c79d19babf27
Commit Graph

270227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etan Cohen
594b71ca62 Merge changes from topic 'enable_nan' am: 62419a0138 am: 20d6e886a7 
am: 6e318896ea

Change-Id: I5e5057b4e5ea146d133b4cea22602ff6650f29e6
 2016-09-07 04:46:38 +00:00
Etan Cohen
6e318896ea Merge changes from topic 'enable_nan' am: 62419a0138 
am: 20d6e886a7

Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c
 2016-09-07 04:40:27 +00:00
Lorenzo Colitti
42a5b34196 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours am: 8b8bef622a -s ours 
am: 36f0dc6271

Change-Id: I01e6be4e2a01f613ae6676dbc451f1e1fc1898c0
 2016-09-07 04:38:43 +00:00
Etan Cohen
826ba669c7 [NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours am: e3efe944fd -s ours 
am: 481a9c73da

Change-Id: Ie40c480b45fcb5a660335eb42a71afcf8a8cebb5
 2016-09-07 04:38:37 +00:00
Lorenzo Colitti
36f0dc6271 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours 
am: 8b8bef622a  -s ours

Change-Id: Id410b4653b3314766eac6b185577cc7708e0823b
 2016-09-07 04:33:24 +00:00
Etan Cohen
20d6e886a7 Merge changes from topic 'enable_nan' 
am: 62419a0138

Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216
 2016-09-07 04:33:23 +00:00
Etan Cohen
481a9c73da [NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours 
am: e3efe944fd  -s ours

Change-Id: I439ed5ac5b70f6e693a441d8b6000f208351a3f7
 2016-09-07 04:33:21 +00:00
Lorenzo Colitti
8b8bef622a Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] 
am: 4171cdf303  -s ours

Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198
 2016-09-07 04:28:21 +00:00
Etan Cohen
e3efe944fd [NAN] Add transport type for NAN. [DO NOT MERGE] 
am: bd9fdbe022  -s ours

Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7
 2016-09-07 04:27:28 +00:00
Etan Cohen
62419a0138 Merge changes from topic 'enable_nan' 
* changes:
  Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
  [NAN] Add transport type for NAN. [DO NOT MERGE]
 2016-09-07 04:19:52 +00:00
Roshan Pius
d74f710e25 Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12 
am: 478bb2b44d

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263
 2016-09-06 23:21:41 +00:00
Mathieu Chartier
c49450e536 Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b am: 7554be1e36 
am: e65bf6d173

Change-Id: If800f4ea170dce4c3c3a478305b990748de3139e
 2016-09-06 23:15:04 +00:00
Roshan Pius
478bb2b44d Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 
am: e597198f12

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208
 2016-09-06 23:12:01 +00:00
Android Build Merger (Role)
a68fda1ac8 Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a am: b24828bd77" into nyc-mr1-dev-plus-aosp 2016-09-06 23:11:18 +00:00
Android Build Merger (Role)
aee547867d Merge "Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp am: 9c6e51be17" into nyc-mr1-dev-plus-aosp 2016-09-06 23:11:09 +00:00
Android Build Merger (Role)
451b0667da Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e am: 202e00bec0" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:54 +00:00
Android Build Merger (Role)
288f5a3572 Merge "Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp am: c4f7166e19" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:45 +00:00
Android Build Merger (Role)
06022f9a8c Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc am: 893fbf87dc" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:36 +00:00
Android Build Merger (Role)
7fc3193792 Merge "Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp am: 170cf7938a" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:25 +00:00
Android Build Merger (Role)
e2dadf9914 Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3 am: 18d954183a" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:13 +00:00
Android Build Merger (Role)
b52be559bc Merge "Merge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into nyc-dev-plus-aosp am: 1b332aa41f" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:05 +00:00
yuanhuihui
29b3e92296 Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a 
am: b24828bd77

Change-Id: Ic01c8c6ecf5c91e055fb05f6317d4d7ae71f1be6
 2016-09-06 23:08:55 +00:00
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
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 eab17da588)

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 7b84987a6a)

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