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
Etan Cohen
a7b2fff388 Merge "[NAN] Remove failure reason codes from API per API review" 2016-09-26 14:48:48 +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
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
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
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
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
Dimitry Ivanov
6a7c807d65 Merge "Add missing liblog dependency" 2016-09-24 22:07:37 +00:00
Dimitry Ivanov
1f34a1baeb Add missing liblog dependency 
Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92
 2016-09-23 17:20:32 -07:00
Kevin Hufnagle
e9681e192a docs: Added note in getCacheDir() that developers can use directory 
obtained from getExternalCacheDir() to store app caches larger than
1 MB.

Bug: 22505268
Change-Id: I9972ba5ef7b43a135c00ac48a2e5ccb1fcc5b103
 2016-09-23 16:44:03 -07:00
Hemal Patel
b4bab2d0ee Docs: Added contents for Vector Drawables 
Added contents to give an overview of VectorDrawables and
AnimatedVectorDrawables. For better understanding, added two graphic
files to explain the overall working of the XML file and the graphic
that is rendered as an output of the XML file.

Bug: 28072772
Change-Id: I9b6513c4b6e5aec59f45155963ff732fdd7b5784
 2016-09-23 16:00:08 -07:00
Kevin Hufnagle
bdb308a059 docs: Added min/max values and descriptions for alpha getter/setter 
in ImageView

Bug: 12644483
Change-Id: I269d63b50412ecea5269acb99fc09c8110e404b4
 2016-09-23 15:54:42 -07:00
Mark Lu
92391ed7e2 Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev 
am: d91c303e6c

Change-Id: Ieaf7e14ac25bab608ec5e67d9d768aa91f97b880
 2016-09-23 22:18:40 +00:00
Mark Lu
56be5c1ae0 docs: update javadoc description for View.setVisibility() method 
am: ae0459f532

Change-Id: I3c9d70fc6fc2b6770076454cdfbb1ed1b619dfb9
 2016-09-23 22:18:35 +00:00
Mark Lu
229daadefc Merge "docs: update docs for uses-feature element" into nyc-dev 
am: dc24613bf3

Change-Id: I4a9b85554ee2a744adda9f3e4bc3d76788d7d3c1
 2016-09-23 22:17:05 +00:00
Mark Lu
1beb4c4cc3 docs: update docs for uses-feature element 
am: b463a6db08

Change-Id: I82dbfdda1c642016ed63d95f77ee69aebc08d25f
 2016-09-23 22:17:00 +00:00
Mark Lu
5a418d40ba Merge "docs: Add param info to TextView.setTextColor" into nyc-dev 
am: 7df8927691

Change-Id: I8ed21e40b96aa913b70fb24c649f3a310e99f2aa
 2016-09-23 22:15:13 +00:00
Mark Lu
5080a2c5e1 docs: Add param info to TextView.setTextColor 
am: 193879a8b6

Change-Id: I8c903627670c946bd421b3e77bbd2a372f21adf0
 2016-09-23 22:15:10 +00:00
Mark Lu
d91c303e6c Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev 2016-09-23 22:10:39 +00:00
Mark Lu
dc24613bf3 Merge "docs: update docs for uses-feature element" into nyc-dev 2016-09-23 22:10:23 +00:00
Mark Lu
7df8927691 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev 2016-09-23 22:09:34 +00:00
Mark Lu
026b8e9a7c Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev 
am: c6a1076e40

Change-Id: I5ad3652863fef338ec6c704b9b030d9338256ac3
 2016-09-23 21:52:33 +00:00
Mark Lu
cc9f8e2418 docs: Mention SwitchCompat in Switch and toggle documentation 
am: 3404032dfc

Change-Id: Ia8aaadb4656a0fcb631ef9608f01afde4a00c4aa
 2016-09-23 21:52:30 +00:00
Mark Lu
c6a1076e40 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev 2016-09-23 21:47:31 +00:00
Eric Laurent
75bf3fd73b DO NOT MERGE - fix truncated boot sound 
Wait for audioserver service initialization to complete
before playing the sound

Bug: 31651778
Change-Id: I988de549d20468a090c939a1c624ee47d4036cd3
 2016-09-23 21:23:27 +00:00
Andrew Solovay
8e3eed9102 Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev 
am: ddcf2deb14

Change-Id: Id81d393e2a8f1f40b9a50e6b266d9ce6e1fe6d4e
 2016-09-23 21:23:27 +00:00
Andrew Solovay
41e90a2548 docs: Removed two images that were moved to Piper in April 
am: f955d4cd9f

Change-Id: I5bee69d05597c00ac04ebf0b5e281e1a468be1d5
 2016-09-23 21:23:23 +00:00
Andrew Solovay
ddcf2deb14 Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev 2016-09-23 21:15:32 +00:00
Andrew Solovay
572d710ba3 docs: Redirect for /preview/setup-sdk.html 
Forgot to add a redirect for this one when N released. Redirects
were staged to http://go/dods-stage

Change-Id: I333fbe9a51ae4d105e35ef4b86f36e576032f9fe
 2016-09-23 13:56:11 -07:00
Etan Cohen
ede1d0f211 [NAN] Add Handler to publish/subscribe per API review 
All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
 2016-09-23 10:16:26 -07:00
Gopal Krishna Shukla
621e87d72f Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674 
am: 810c31fdca

Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
 2016-09-23 13:11:23 +00:00
Gopal Krishna Shukla
810c31fdca Merge "Provide synchronization to setview to avoid NPE" 
am: b05b93a674

Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
 2016-09-23 13:07:52 +00:00
Treehugger Robot
b05b93a674 Merge "Provide synchronization to setview to avoid NPE" 2016-09-23 12:57:58 +00:00
Etan Cohen
0517a6dcc7 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 
am: a29bcecad9

Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135
 2016-09-23 04:16:50 +00:00
Etan Cohen
a29bcecad9 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 
am: bc3d106b97

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e
 2016-09-23 04:07:30 +00:00