Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
94da8023d5 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev 
am: 900550de49

Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1
 2016-09-19 20:47:39 +00:00
Etan Cohen
0027ddf990 Merge "[NAN] Update API: replace looper with handler" 2016-09-19 20:47:37 +00:00
Sudheer Shanka
5c53e1b8bb DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
am: e8340a9ed5

Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e
 2016-09-19 20:47:35 +00:00
Etan Cohen
0fbeb0543e [NAN] Update API: replace looper with handler 
Per API council guidelines.

(cherry-pick of commit 0ff5bf0092eb25f579e2e93fb2f93bc953b39211)

Bug: 31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1
 2016-09-19 20:47:15 +00:00
Cuihtlauac ALVARADO
b2a1ee15c9 Merge "Fix parameter description" am: 750b523aa2 
am: df5f3e6db8

Change-Id: Ia6b8efc3a910188f48f10abc3f0fc5d2e7d36146
 2016-09-19 20:45:31 +00:00
Cuihtlauac ALVARADO
df5f3e6db8 Merge "Fix parameter description" 
am: 750b523aa2

Change-Id: I5edb7e6910b92d3c2f93a61fc9e68489ece8e72f
 2016-09-19 20:26:56 +00:00
Sudheer Shanka
2046f3f621 Merge "Fix deadlock in AcitivityManagerService." into nyc-dev 
am: e70ebd694b

Change-Id: I7ff533b33ef48ffe82954937eb68a212e17001c0
 2016-09-19 20:16:23 +00:00
Sudheer Shanka
a4c9bbefdf Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev 
am: d1e3e53d79

Change-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404
 2016-09-19 20:16:17 +00:00
Sudheer Shanka
433a36e9df Fix deadlock in AcitivityManagerService. 
am: 67e05b4d28

Change-Id: Ie590be7c82c693691e69a5855602c4ed5499c428
 2016-09-19 20:16:16 +00:00
Sudheer Shanka
a437e7f3f1 DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
am: dce4be63bb

Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0
 2016-09-19 20:16:13 +00:00
Sudheer Shanka
96d70301e6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev 
am: 38077274d0

Change-Id: I10b7e25858e63110a63b4e92742c1305f0e9eed0
 2016-09-19 20:16:00 +00:00
Sudheer Shanka
2f44f906a6 DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
am: b59e73613b

Change-Id: Ibb2cba35ebedc884247c189a214ccce396333342
 2016-09-19 20:15:56 +00:00
Sudheer Shanka
43a1f74d7f Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev 
am: b358ee3558  -s ours

Change-Id: Idf726fba98ec0e78135498248d111d8571324657
 2016-09-19 20:14:20 +00:00
Sudheer Shanka
bab9c1006a DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
am: 2d608378f4  -s ours

Change-Id: Ie6c10a3ef11ea0ec560f20ef49f14f46184d1a4d
 2016-09-19 20:14:16 +00:00
Dianne Hackborn
da6be5b871 A little more on issue #30766518: Document what targeting N does 
(cherry picked from commit 5f1649e852)

Change-Id: Ieaad1f3ddfa7ef3444e3b513181555f87ecb8c3f
 2016-09-19 20:05:07 +00:00
Treehugger Robot
750b523aa2 Merge "Fix parameter description" 2016-09-19 20:02:27 +00:00
Sudheer Shanka
b358ee3558 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev 2016-09-19 20:01:51 +00:00
Sudheer Shanka
d1e3e53d79 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev 2016-09-19 19:59:22 +00:00
Sudheer Shanka
900550de49 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev 2016-09-19 19:59:18 +00:00
Sudheer Shanka
38077274d0 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev 2016-09-19 19:59:13 +00:00
Sudheer Shanka
e70ebd694b Merge "Fix deadlock in AcitivityManagerService." into nyc-dev 2016-09-19 19:59:09 +00:00
Eric Schmidt
a3be192935 Merge "docs: Fixed language directory issue localization" into nyc-dev 
am: 52fd8f88e1

Change-Id: I9dc9b3b802788a29b8c19ea2e949682964d82e1d
 2016-09-19 19:52:02 +00:00
Eric Schmidt
92de673e07 docs: Fixed language directory issue localization 
am: 8350cbf824

Change-Id: I7dccff2f3cee2468131497723b8fefbf7e7e99bb
 2016-09-19 19:51:56 +00:00
Eric Schmidt
52fd8f88e1 Merge "docs: Fixed language directory issue localization" into nyc-dev 2016-09-19 19:47:22 +00:00
Kevin Hufnagle
bd66ef7f2f docs: Revised "activity launched with NFC intent" code sample to 
demonstrate using onNewIntent() in these situations

Bug: 17129447
Change-Id: I6e60b273f8138be918708f59402866ae617af0cb
 2016-09-19 12:45:31 -07:00
Dianne Hackborn
491bc2b8d6 Cherrypick so we can publish N version code description ASAP 
Fix issue #30766518: Document what targeting N does

Also small documentation cleanup in a few other places.

(cherry picked from commit b34cbedb4e)

Change-Id: I9560b29faa4f2674277349272af8193122a1f95e
 2016-09-19 19:31:19 +00:00
Kevin Hufnagle
5232329b4e docs: Added note in LayoutTransition class reference that APPEARING 
and DISAPPEARING animation timelines cannot overlap

Bug: 16808571
Change-Id: I8cbac11da4f866f2d3bcde45996b039e9bdfb801
 2016-09-19 12:02:33 -07:00
yuanhuihui
731918e769 Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481 
am: b2eb8ea894

Change-Id: I5ace39e2b6b679622f9c2ab27831a1e079541e32
 2016-09-19 18:40:37 +00:00
yuanhuihui
b2eb8ea894 Merge "fix wrong algorithm in WifiPowerPerPacket()" 
am: 16e1007481

Change-Id: I3bacf3deb99b10c5ae8fe22a02ad7066afc321e0
 2016-09-19 18:34:42 +00:00
Kevin Hufnagle
c0c4ac5e35 docs: Fixed broken link to Android KeyStore facility 
Bug: 13663279
Change-Id: I859b3c9a35f9e6c63cb0c29260f4aa1aa33ab15c
 2016-09-19 11:31:08 -07:00
Treehugger Robot
16e1007481 Merge "fix wrong algorithm in WifiPowerPerPacket()" 2016-09-19 18:28:47 +00:00
Kevin Hufnagle
b248b1f689 docs: Clarified definition of KeyEvent.Callback.onKeyMultiple() 
The onKeyMultiple() event captures simulated, not actual, presses of
the same key in rapid succession. Adjusted the method definition to
include this clarification.

Bug: 2335983
Change-Id: Id01182d81dafe98df9e559ff24f9e1d5a1f949c3
 2016-09-19 11:22:31 -07:00
smain@google.com
5f3de5f6af update DAC landings for Studio 2.2 
am: f032cbfafc

Change-Id: Iae59c312e3d1db6edc70bf253df264fc3e574360
 2016-09-19 18:06:34 +00:00
Kevin Hufnagle
49ed3eb8bc docs: Added descriptions of "Pricing Template ID" column to in-app 
products CSV guide

Bug: 31507720
Change-Id: Ic95bd1dab5d1fb75a6dbab9dba5f0f8195f4090e
 2016-09-19 10:48:31 -07:00
smain@google.com
f032cbfafc update DAC landings for Studio 2.2 
Change-Id: I5ab5cb935ca058b543bd5751c3cdcc7cbf92a1dd
 2016-09-19 10:42:34 -07:00
Etan Cohen
eb1c7afdcf Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a 
am: 5a07e3b2e8

Change-Id: I8b7949009b9e6de95ac5effc4c3f51d16232ce07
 2016-09-19 16:18:12 +00:00
Etan Cohen
5a07e3b2e8 Merge "[NAN] Make parcelable class final - per API linter" 
am: 3fcabac35a

Change-Id: Id769353ac251015fbd3af2c5e0134c5de5b418d4
 2016-09-19 16:11:34 +00:00
Etan Cohen
3fcabac35a Merge "[NAN] Make parcelable class final - per API linter" 2016-09-19 16:03:59 +00:00
Paul Jensen
7e5c4bdeb6 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 am: f8d3ded044 
am: 8279621b82

Change-Id: I7d26fb2a217669e43c1a340ab1e2383162d6cc0b
 2016-09-19 15:21:39 +00:00
Paul Jensen
8279621b82 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 
am: f8d3ded044

Change-Id: Id7ca0a8a930e3abfd7edd3a5f192ca478de51a34
 2016-09-19 15:15:52 +00:00
Paul Jensen
f8d3ded044 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 
am: cc3287ef42

Change-Id: Ie67919fe79a9102b7bb5b0dd10f66816fdf03e81
 2016-09-19 15:08:59 +00:00
Paul Jensen
cc3287ef42 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 
am: ad004292e1

Change-Id: I3c5ac16e2a7cad533c7d8c8b0e611bd26743e875
 2016-09-19 15:02:28 +00:00
Paul Jensen
ad004292e1 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 
am: a81dd677d3

Change-Id: Id2da47a2300b6fd211da08daddc1873bdc519e14
 2016-09-19 14:55:54 +00:00
Paul Jensen
a81dd677d3 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f 
am: d6a5f68f52

Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
 2016-09-19 14:50:48 +00:00
Paul Jensen
d6a5f68f52 Fix build break due to automerge of 7d2198b5 am: baae57ab24 
am: 009e08116f

Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
 2016-09-19 14:43:28 +00:00
Paul Jensen
009e08116f Fix build break due to automerge of 7d2198b5 
am: baae57ab24

Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
 2016-09-19 14:37:29 +00:00
Etan Cohen
8c3354f719 [NAN] Make parcelable class final - per API linter 
(cherry-pick of feef60406e)

Bug: 31380952
Test: build + sl4a integration test (WifiNanManagerTest:test_nan_discovery_session)
Change-Id: I74c079763d6b3a4f0119b16acd7a18014a10ebbd
 2016-09-19 14:09:42 +00:00
Paul Jensen
baae57ab24 Fix build break due to automerge of 7d2198b5 
Bug: 30100884

Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
 2016-09-19 13:27:41 +00:00
Paul Jensen
c3152d2edc Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a am: bedb94754b am: a728ecff98 
am: 410b6d68e2

Change-Id: Icd5dc1d649108e7486242fc0bec419eeae1cbf63
 2016-09-19 12:41:58 +00:00
Paul Jensen
01a71e4a75 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d am: 34e77bb699 am: d3a9c09052 
am: c20692329e

Change-Id: Icc7fbeca3a87a44412d30bd6b8d888f5e277b251
 2016-09-19 12:37:54 +00:00