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
David Friedman
410ae5b004 Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev 2016-08-19 21:17:56 +00:00
David Friedman
162a0005ac Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev 2016-08-19 21:16:56 +00:00
Jim Miller
78ec20382a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours 
am: ce0856f702

Change-Id: I1d859808485d2e75220da9cc41cdf8b945475a82
 2016-08-19 20:31:38 +00:00
Jim Miller
8dd7365754 Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours 
am: f159feff98

Change-Id: I1064ef601b45a43ea248fbf6d5dd0194d0d61288
 2016-08-19 20:31:34 +00:00
Jim Miller
ce0856f702 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 
am: 364a51221a  -s ours

Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
 2016-08-19 20:23:50 +00:00
Jim Miller
f159feff98 Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 
am: 85c390e9fb  -s ours

Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
 2016-08-19 20:23:45 +00:00
Jim Miller
364a51221a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 
am: ddf70b9195

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
 2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
 2016-08-19 20:16:34 +00:00
Jim Miller
ddf70b9195 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 
am: 02e9affa42

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
 2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991 Bind fingerprint when we start authentication - DO NOT MERGE 
am: b6f4b48df2

Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
 2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 2016-08-19 20:03:48 +00:00
David Friedman
196cb73dbb Docs: Adds a redirect to make it easier to access Performance section on DAC. 
d.android.com/performance will now take you to d.android.com/topic/performance

Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
 2016-08-19 18:58:28 +00:00
David Friedman
cbaf3f9986 Docs: Adding information to Building-for-Billions landing page. 
Bug: 30700934

Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
 2016-08-19 11:51:24 -07:00
Sudheer Shanka
76c4b2a7b6 resolve merge conflicts of 270947f to klp-modular-dev 
Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47
 2016-08-19 11:37:22 -07:00
Sudheer Shanka
de13c7a45b Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours 
am: e49de5e073

Change-Id: I2213eaf49053cc4ac01746411fc7a35c6b0477b4
 2016-08-19 18:09:57 +00:00
Amith Yamasani
b07b5f745a DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours 
am: f705730667

Change-Id: Ic8bc51f29553e19aabd44f8123d6434ed36d15a2
 2016-08-19 18:09:53 +00:00
Sudheer Shanka
e49de5e073 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 
am: 58def3804c  -s ours

Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
 2016-08-19 18:02:26 +00:00
Amith Yamasani
f705730667 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 
am: 5841c492a7  -s ours

Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
 2016-08-19 18:02:22 +00:00
Sudheer Shanka
03b0f5c3ec Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours 
am: f368bdee06

Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c
 2016-08-19 18:01:17 +00:00
Sudheer Shanka
58def3804c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 
am: 08eb52f9f9

Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
 2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
 2016-08-19 17:54:19 +00:00
Sudheer Shanka
21ef672cab Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 
am: de04301f9a

Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
 2016-08-19 17:46:12 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb 
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
 2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
 2016-08-19 17:32:44 +00:00
Sudheer Shanka
270947f78c DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: a3af5c6207

Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
 2016-08-19 17:32:01 +00:00
Amith Yamasani
c8aedeeaf6 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours 
am: 9be12f8986

Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
 2016-08-19 17:31:47 +00:00
Sudheer Shanka
8b948eee03 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev 
am: badc5cd942

Change-Id: I3c783e856777500d86cc5ae162ab82a727e42967
 2016-08-19 17:31:47 +00:00
Sudheer Shanka
dd0be992c0 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev 
am: 5e55214ab7

Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
 2016-08-19 17:31:43 +00:00
Amith Yamasani
b7380a1c0c DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: 55eacb9441

Change-Id: Id1ee0a3dd76a7bb549838e9d74b9927956b96570
 2016-08-19 17:31:40 +00:00
Amith Yamasani
4d7740907e DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: b02862c2cf

Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
 2016-08-19 17:31:39 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
 2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
 2016-08-19 17:22:25 +00:00
Sudheer Shanka
f368bdee06 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev 
am: 96052ea905  -s ours

Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
 2016-08-19 17:11:30 +00:00
Amith Yamasani
9be12f8986 DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: a92810a189  -s ours

Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
 2016-08-19 17:11:28 +00:00
Sudheer Shanka
de04301f9a Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 2016-08-19 17:07:06 +00:00
Sudheer Shanka
5e55214ab7 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev 2016-08-19 17:07:01 +00:00
Sudheer Shanka
96052ea905 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev 2016-08-19 17:06:58 +00:00
Sudheer Shanka
b51e98becb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 2016-08-19 17:06:55 +00:00
Sudheer Shanka
badc5cd942 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev 2016-08-19 17:06:49 +00:00
Jim Miller
b6f4b48df2 Bind fingerprint when we start authentication - DO NOT MERGE 
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
 2016-08-19 03:46:40 +00:00
Scott Main
6e10a6c034 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev 
am: 66ffbbfdf9

Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
 2016-08-19 01:12:12 +00:00
smain@google.com
a4b2c2889b fix redirect for AIDL doc bug: 5967288 
am: 9ad944f8c9

Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
 2016-08-19 01:12:08 +00:00
Scott Main
66ffbbfdf9 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev 2016-08-19 01:04:03 +00:00
Ajay Panicker
2bad652e56 Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 
am: 779a1f096c

Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
 2016-08-18 22:37:06 +00:00
Ajay Panicker
779a1f096c Merge "Protect various Bluetooth broadcasts" 
am: 53ff75bb68

Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
 2016-08-18 22:32:09 +00:00
Treehugger Robot
53ff75bb68 Merge "Protect various Bluetooth broadcasts" 2016-08-18 22:25:40 +00:00
smain@google.com
9ad944f8c9 fix redirect for AIDL doc 
bug: 5967288

Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
 2016-08-18 14:41:47 -07:00
Ajay Panicker
1f5b786ad0 Protect various Bluetooth broadcasts 
Bug: 30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit 9a236066db)
 2016-08-18 13:50:13 -07:00
Narayan Kamath
c6c7ca0cde Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 
am: 86437ec433

Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
 2016-08-18 10:30:00 +00:00
Narayan Kamath
3c63bb367f Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 
am: b9fae65605

Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
 2016-08-18 10:29:55 +00:00