Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Horwich
5ca7164e54 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa 
am: 70399b36ce

Change-Id: I92ab3a5beee114aa0b325f831d87dd6e2abc96f5
 2016-09-26 15:37:39 +00:00
Josh Horwich
02beabcd02 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa 
am: 2cad9a8e69

Change-Id: I38ac6a900d8a36b141839a9b9f87bc5a62106ac6
 2016-09-26 15:37:37 +00:00
Josh Horwich
10526c8ff8 Docs: Fix missing space am: 999fe148e4 
am: be06ffc238

Change-Id: Iabb317e329c7d66b6f63951b5c984ad7c521f1eb
 2016-09-26 15:36:47 +00:00
Josh Horwich
0f895d3d9c Docs: Fix missing space am: 999fe148e4 
am: 0413b48aba

Change-Id: I701120ce04f3b5a4dfbb8ebb4dc4b348970ba4e7
 2016-09-26 15:36:46 +00:00
Michael Wright
e022ea98ee DO NOT MERGE Track generics in API definition. 
am: 62b7f8bf7c

Change-Id: I02d32857ebdc9316d19a35bc253555e73b54c9bb
 2016-09-26 15:35:28 +00:00
Josh Horwich
2cad9a8e69 Merge "Docs: Fix missing space" into nyc-dev 
am: fd0a31c0aa

Change-Id: Ie1541b1ba2747d888b5b9dd0479a250aa80d02e7
 2016-09-26 15:31:53 +00:00
Josh Horwich
be06ffc238 Docs: Fix missing space 
am: 999fe148e4

Change-Id: I680a07574811450aca18036ad05a0740884363e2
 2016-09-26 15:31:48 +00:00
Josh Horwich
70399b36ce Merge "Docs: Fix missing space" into nyc-dev 
am: fd0a31c0aa

Change-Id: Ib888812a14fde7497d2979224b44053c7b78d694
 2016-09-26 15:31:45 +00:00
Josh Horwich
0413b48aba Docs: Fix missing space 
am: 999fe148e4

Change-Id: I2b68e855bcb9e3f76d8cf04c93097a265b03d13d
 2016-09-26 15:31:42 +00:00
TreeHugger Robot
6f1b29ef67 Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev 2016-09-26 15:29:17 +00:00
TreeHugger Robot
fd0a31c0aa Merge "Docs: Fix missing space" into nyc-dev 2016-09-26 15:22:57 +00:00
Etan Cohen
fe06766539 Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388 am: 3f1c33c7b8 
am: 11b8fe0340

Change-Id: I505cc2614754afa9039126bd502a9e58f45184b3
 2016-09-26 15:09:48 +00:00
Etan Cohen
11b8fe0340 Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388 
am: 3f1c33c7b8

Change-Id: I49da76b668005d0cc8904794c5eed155697698ef
 2016-09-26 15:05:05 +00:00
Etan Cohen
3f1c33c7b8 Merge "[NAN] Remove failure reason codes from API per API review" 
am: a7b2fff388

Change-Id: I2d16cebc4357a88ba44a7e209a1ddb8718516c4f
 2016-09-26 14:58:37 +00:00
Etan Cohen
93617997bb [NAN] Change Broadcast for NAN status change to notification only 
Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.

(cherry-pick of commit 905077a590)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
 2016-09-26 07:53:57 -07:00
Etan Cohen
a7b2fff388 Merge "[NAN] Remove failure reason codes from API per API review" 2016-09-26 14:48:48 +00:00
Richard Uhler
787924886b Merge "Add count of WebView instances to meminfo" into nyc-mr1-dev am: b0216412a2 
am: e08ea2e477

Change-Id: I357126ee40537530aace46d30e8677ef6c8e9861
 2016-09-26 14:44:20 +00:00
Richard Uhler
780ba35aa9 Add count of WebView instances to meminfo am: 2c0361986b 
am: 8f61c5fe59

Change-Id: I797b6e09c1cff5a92a135c9ad0dc06fec97e3e36
 2016-09-26 14:43:10 +00:00
Richard Uhler
e08ea2e477 Merge "Add count of WebView instances to meminfo" into nyc-mr1-dev 
am: b0216412a2

Change-Id: Ic9095caa0f21be5902900d9cf3f62accbb41b232
 2016-09-26 14:38:40 +00:00
Richard Uhler
8f61c5fe59 Add count of WebView instances to meminfo 
am: 2c0361986b

Change-Id: I6b33039e70a20e7aaf0613081e8e64ee7e56873a
 2016-09-26 14:38:38 +00:00
TreeHugger Robot
b0216412a2 Merge "Add count of WebView instances to meminfo" into nyc-mr1-dev 2016-09-26 14:33:31 +00:00
Michael Wright
d89cb31606 Merge changes from topic 'aosp-generics-api' am: fe9357f6e7 am: 98f6bbbec8 
am: 225e8943b8

Change-Id: I1af36d72e88b2538cb68a214722ebb5c9690fdc3
 2016-09-26 14:33:00 +00:00
Michael Wright
08516ce1d6 DO NOT MERGE Track generics in API definition. am: b4fcc6136e -s ours am: 3d3413ea8b -s ours 
am: 60feb75750

Change-Id: I431cacdcdac15d6c43297dc19e6ce11ea5536b68
 2016-09-26 14:29:08 +00:00
Dianne Hackborn
ed7264ec62 DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API am: a0e55c43c2 -s ours am: 85ecb3405a -s ours 
am: 3229911922

Change-Id: Id844f28f3992360c73d7c7fda7b2f7e8a3fc3b4c
 2016-09-26 14:28:23 +00:00
Michael Wright
225e8943b8 Merge changes from topic 'aosp-generics-api' am: fe9357f6e7 
am: 98f6bbbec8

Change-Id: Iffa1f7621e298f0528dbf8d9be82c1d842982b62
 2016-09-26 14:25:02 +00:00
Michael Wright
60feb75750 DO NOT MERGE Track generics in API definition. am: b4fcc6136e -s ours 
am: 3d3413ea8b  -s ours

Change-Id: I15ae4a6e3283be6ff9a566186210c0f50b504bfa
 2016-09-26 14:21:33 +00:00
Dianne Hackborn
3229911922 DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API am: a0e55c43c2 -s ours 
am: 85ecb3405a  -s ours

Change-Id: I9444bff28f2cf6131b5aa13b84cb375181b5a9ad
 2016-09-26 14:20:45 +00:00
Michael Wright
98f6bbbec8 Merge changes from topic 'aosp-generics-api' 
am: fe9357f6e7

Change-Id: Ifff5983e6c85faefa91e8ec5de4221cc715c575c
 2016-09-26 14:19:45 +00:00
Michael Wright
3d3413ea8b DO NOT MERGE Track generics in API definition. 
am: b4fcc6136e  -s ours

Change-Id: Iada343936c04f2a7f3875f86c1f8c48c5a62be2b
 2016-09-26 14:14:22 +00:00
Dianne Hackborn
85ecb3405a DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API 
am: a0e55c43c2  -s ours

Change-Id: I15b1ff09f6c346001e89c06b45b91e92adbceae8
 2016-09-26 14:13:44 +00:00
Treehugger Robot
fe9357f6e7 Merge changes from topic 'aosp-generics-api' 
* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
 2016-09-26 14:04:57 +00:00
Etan Cohen
60aad2a2ba Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131 
am: 10132fb994

Change-Id: I0be79dd5b8d21a94fd6a40fd08d054ed30003a8b
 2016-09-26 13:15:38 +00:00
Etan Cohen
10132fb994 Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a 
am: a6c2aa4131

Change-Id: I2520b4d4f59b6e94c655c7769b6a02382eeae7ad
 2016-09-26 13:11:02 +00:00
Etan Cohen
a6c2aa4131 Merge "[NAN] Reorder parameters of send message method(s) per API review" 
am: 1dd012a41a

Change-Id: I6b32b5fde71753bed0a16250065551dc3f218f54
 2016-09-26 13:06:05 +00:00
Etan Cohen
5542ccc59c [NAN] Remove failure reason codes from API per API review 
Not all codes are actionable. Will add back if/as needed.

(cherry-pick of commit 4b47c3f5b8)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
 2016-09-26 06:05:06 -07:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Michal Karpinski
0d54a95b62 Fix naming of the service in NetdEventListenerServiceTest 
Bug: 29748723
Change-Id: I285cb77fba824036df80a9ed2560ee95d1d1919c
(cherry picked from commit 4f26103fdd)
 2016-09-26 10:43:56 +00:00
Narayan Kamath
c4108d2f24 Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250 
am: 5e7dd0999e

Change-Id: I45e2c290cbed1fcf917d54f6a50a60bfa7540f44
 2016-09-26 10:11:57 +00:00
Narayan Kamath
5e7dd0999e Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 
am: c1d97c9250

Change-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949
 2016-09-26 10:07:19 +00:00
Narayan Kamath
c1d97c9250 Merge "Remove (now) unnecessary reference to core-lambda-stubs." 
am: 68e91852c3

Change-Id: I43ac61098a1dd8986385d61b702459c63e640c73
 2016-09-26 10:02:48 +00:00
Treehugger Robot
68e91852c3 Merge "Remove (now) unnecessary reference to core-lambda-stubs." 2016-09-26 09:55:36 +00:00
takuya,souma
895da77aa6 Reset mCurrentUserId when fingerprintd died 
A template fingerprint data is not loaded in fingerprintd when
fingerprintd is died and restarted.
FigerprintService tries to set userId after a restart of fingerprintd,
but it's skipped because the service tries to set same userId already
set to mCurrentUserId.

To load correct template fingerprint data, reset mCurrentUserId
when fingerprintd died.

Bug: 31734514
Change-Id: I0d3452fc6c1f82bb2a2af10f61d3f3a47df9dec6
 2016-09-26 14:42:43 +09:00
Etan Cohen
7fa6ab7f9a Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df 
am: 3c94a1c56c

Change-Id: I3e8726f736066943164bb937f1f3aba6b415e1aa
 2016-09-26 00:30:53 +00:00
Etan Cohen
3c94a1c56c Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 
am: c8f03c33df

Change-Id: I3bec0e3b27bea4516a73b428788c68858354eaf7
 2016-09-26 00:26:39 +00:00
Etan Cohen
c8f03c33df Merge "[NAN] Add Handler to publish/subscribe per API review" 
am: 95abef9355

Change-Id: I31f34ec26776ae7168128c47cda0fc29d08c7753
 2016-09-26 00:21:46 +00:00
Etan Cohen
8a66410296 [NAN] Reorder parameters of send message method(s) per API review 
Move messageId before message in the argument list.

(cherry-pick of commit 3da7c88425)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
 2016-09-25 17:19:05 -07:00
Etan Cohen
95abef9355 Merge "[NAN] Add Handler to publish/subscribe per API review" 2016-09-26 00:13:42 +00:00
Dimitry Ivanov
01a1375cef Merge "Add missing liblog dependency" am: 6a7c807d65 am: 247fe92207 
am: be037cba4c

Change-Id: Ibcb0d57f3a88d8d34c7d992f1552ea4b2cdf8a15
 2016-09-24 22:22:20 +00:00
Dimitry Ivanov
be037cba4c Merge "Add missing liblog dependency" am: 6a7c807d65 
am: 247fe92207

Change-Id: I4f3363f8345597f4514828597cce9bbd6b0d1658
 2016-09-24 22:18:20 +00:00
Dimitry Ivanov
247fe92207 Merge "Add missing liblog dependency" 
am: 6a7c807d65

Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648
 2016-09-24 22:14:48 +00:00