Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
f7304c8cc8 update links to studio docs 
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
 2016-05-19 23:43:17 +00:00
Chih-Hung Hsieh
032dcff201 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 am: f55c9f7aa6 
am: d5bb8487d5

* commit 'd5bb8487d58b168543d6504504d8e89e062a6b8b':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb
 2016-05-19 23:39:59 +00:00
Chih-Hung Hsieh
5905c14a59 Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d am: d05b6478d5 
am: 03df422689

* commit '03df42268995e3742aeb42ee6a77048dcc8fd889':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Id2bf8a02360cf917957f77d2cde284dda35e75a1
 2016-05-19 23:39:56 +00:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
 2016-05-19 23:34:58 +00:00
Chih-Hung Hsieh
03df422689 Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d 
am: d05b6478d5

* commit 'd05b6478d5341f7d70e78fad031d2d426155f68a':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Ibee251ace2e3f15b98a8f91da0d8450069500177
 2016-05-19 23:34:54 +00:00
smain@google.com
73cf8224cb update links to studio docs 
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
 2016-05-19 16:30:43 -07:00
Android Build Merger (Role)
371b110936 Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837 am: 0720f5885e" into nyc-mr1-dev-plus-aosp 2016-05-19 23:30:14 +00:00
Dirk Dougherty
dcad640fcc Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837 
am: 0720f5885e

* commit '0720f5885e8337f408d7f8be44cc64f83d3f8626':
  Remove outdated google services links.

Change-Id: I28fdb2e4f00fea7ed9519a1ecb039b8e11ebb6d1
 2016-05-19 23:29:41 +00:00
Dirk Dougherty
d57788daa7 Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837" into nyc-dev-plus-aosp 
am: 0cf5b8d0fe

* commit '0cf5b8d0fe74edfe560b795cf57f268d28a652cd':
  Remove outdated google services links.

Change-Id: I44ca465eb20beebe518e6ca122cc8155687c2324
 2016-05-19 23:29:33 +00:00
Chih-Hung Hsieh
f55c9f7aa6 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 
am: 6f4b566169

* commit '6f4b5661696355d230c515a45aca2dddd8fe99b1':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I5333078964a57c20144acb6b538205bde2782c12
 2016-05-19 23:29:32 +00:00
Chih-Hung Hsieh
d05b6478d5 Merge "Fix misc-macro-parentheses warnings in services jni." 
am: fe91d2a83d

* commit 'fe91d2a83daee3604a49c1bae0744cdde6d14b46':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
 2016-05-19 23:29:28 +00:00
Chih-Hung Hsieh
1dd22051b1 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp 
am: 0a87059452

* commit '0a870594527a3af036b1238983abfe4e6118178b':
  Fix misc-macro-parentheses warnings in hwui and graphic jni.

Change-Id: I84afca734f9bf0cf4b9d503b17878d13f5a2b29c
 2016-05-19 23:29:27 +00:00
Android Build Merger (Role)
0cf5b8d0fe Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837" into nyc-dev-plus-aosp 2016-05-19 23:26:35 +00:00
Dirk Dougherty
21c24e63bf Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 
am: f339170837

* commit 'f3391708373758acac5d4c8daf3abe9ca2a38b97':
  Remove outdated google services links.

Change-Id: Ib4dd699dd767dac910af70eb32471570291af482
 2016-05-19 23:26:08 +00:00
Dirk Dougherty
0720f5885e Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 
am: f339170837

* commit 'f3391708373758acac5d4c8daf3abe9ca2a38b97':
  Remove outdated google services links.

Change-Id: I89b08725b84a2618f5a2af0cf216f02b39ee53ad
 2016-05-19 23:25:42 +00:00
Adam Lesinski
6f4b566169 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 2016-05-19 23:25:09 +00:00
Treehugger Robot
fe91d2a83d Merge "Fix misc-macro-parentheses warnings in services jni." 2016-05-19 23:24:03 +00:00
TreeHugger Robot
e9061cf164 Merge "Create frameworks-base-testutils lib" 2016-05-19 23:22:09 +00:00
Chih-Hung Hsieh
0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp 
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
 2016-05-19 16:22:09 -07:00
Dirk Dougherty
f339170837 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc 
am: 8053c79246

* commit '8053c79246f14a78158b6476169299999299d6d8':
  Remove outdated google services links.

Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
 2016-05-19 23:19:12 +00:00
Rebecca Silberstein
df547e04c3 WifiManager: add WIFI_MODE_NO_LOCKS_HELD 
Add a WifiLock mode representing that no locks are held (@hide).

Bug: 28669096
Change-Id: I774d5ff226e7c639812f9735555c8ea1ed6444af
Test: compiles and runtest frameworks-wifi
 2016-05-19 16:18:36 -07:00
Dirk Dougherty
8053c79246 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 
am: 5fb577e6bc

* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
  Remove outdated google services links.

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
 2016-05-19 23:13:57 +00:00
John Reck
bb08e42570 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours am: 02b5805ba3 
am: 93510f46e0

* commit '93510f46e0f4be83fae3a81fb7aac61de8728b42':

Change-Id: I91db9913f0ffc3e75cf0c30b2fed5dd65e32e2fd
 2016-05-19 23:13:16 +00:00
John Reck
1ace036605 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours am: 02b5805ba3 
am: 3a3973d263

* commit '3a3973d263137315e998564a461c54692f39cc06':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I31ee32d36cedc4b0138b9d0ce55dd656bd9915aa
 2016-05-19 23:10:33 +00:00
John Reck
93510f46e0 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours 
am: 02b5805ba3

* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I753de859a133ded85cb89fb914bbe29e195a3432
 2016-05-19 23:07:15 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs 
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
 2016-05-19 23:07:10 +00:00
Chih-Hung Hsieh
404e2b21fc Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 
am: e66235bf00

* commit 'e66235bf00a695cacb44b0bc1a241cabb7de3b96':
  Fix misc-macro-parentheses warnings in hwui and graphic jni.

Change-Id: I08ab0efc29e8b595f087a781d8a66a472f1f9797
 2016-05-19 23:07:09 +00:00
John Reck
3a3973d263 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours 
am: 02b5805ba3

* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Id1ae8b8ead92837ef43e9e40aeac8696fe8a6e76
 2016-05-19 23:06:25 +00:00
Bert McMeen
2a54e47a5d docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e am: 8386df9ea1 
am: 00df4e8cf3

* commit '00df4e8cf3c00486091f67da26598fded57a5c03':

Change-Id: Ic555774a27d71339ba51bfd136f18ae86d1ffe6f
 2016-05-19 23:03:52 +00:00
Treehugger Robot
e66235bf00 Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 2016-05-19 23:02:55 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00
Dirk Dougherty
8b35261e90 Remove outdated google services links. 
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
 2016-05-19 16:00:56 -07:00
Bert McMeen
b1d6983b2f docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e am: 8386df9ea1 
am: bf5dd7b969

* commit 'bf5dd7b9693a5a9f5165ba78e27c8500642ef6f6':
  docs: Update to column widths for Complications table

Change-Id: Id00f7931635bc02a95dd5ac8e4e9549a4367ee6f
 2016-05-19 22:59:52 +00:00
John Reck
02b5805ba3 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 
am: 7298186769  -s ours

* commit '7298186769395978045ed2d35252cdf7f644d85b':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735
 2016-05-19 22:59:26 +00:00
Bert McMeen
00df4e8cf3 docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e 
am: 8386df9ea1

* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
  docs: Update to column widths for Complications table

Change-Id: I9a282a4b7f4b75ea6b51939afc516960bb690161
 2016-05-19 22:57:08 +00:00
Bert McMeen
bf5dd7b969 docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e 
am: 8386df9ea1

* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
  docs: Update to column widths for Complications table

Change-Id: Iacc8d86b622f2ecf46625fdf9d12b31dca78655e
 2016-05-19 22:56:34 +00:00
John Reck
7298186769 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c 
am: 08a4808197

* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
 2016-05-19 22:54:05 +00:00
Android Build Merger (Role)
e6db0f314f Merge "Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813 am: cd44b983fe" into nyc-mr1-dev-plus-aosp 2016-05-19 22:51:38 +00:00
Abhijith Shastry
0980dc26b1 Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813 
am: cd44b983fe

* commit 'cd44b983fed7431ab930852ddd3a22c0d3b19a90':
  Update BlockedNumberContract javadocs.

Change-Id: I93d004752ea4bdcd1c9c5aeb7fa25ddfdad0aad2
 2016-05-19 22:51:07 +00:00
John Reck
08a4808197 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 
am: 0f59d9b80c

* commit '0f59d9b80c9f5daa321b683525ba8732add007c2':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
 2016-05-19 22:50:55 +00:00
Bert McMeen
8386df9ea1 docs: Update to column widths for Complications table am: 76372f02fe 
am: 4cdad3212e

* commit '4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
  docs: Update to column widths for Complications table

Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc
 2016-05-19 22:50:53 +00:00
Abhijith Shastry
4ced2b0732 Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813 
am: 99d1fd935e

* commit '99d1fd935e7d8c8f3b27c41d1a7ebe7ffa0dbe63':
  Update BlockedNumberContract javadocs.

Change-Id: I7bf4ac0a54b69fb2c4084eeac3de2f7de94b102a
 2016-05-19 22:50:34 +00:00
John Reck
0f59d9b80c DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours 
am: a7895725f8

* commit 'a7895725f8858465a404cbe4f6d5091e39423529':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
 2016-05-19 22:47:05 +00:00
Abhijith Shastry
99d1fd935e Merge "Update BlockedNumberContract javadocs." into nyc-dev 
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: Id8d90f28d56223ab1d01be634e83df2ee4dd9e93
 2016-05-19 22:46:57 +00:00
Abhijith Shastry
cd44b983fe Merge "Update BlockedNumberContract javadocs." into nyc-dev 
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: I88cd7749894dc531fb793e800528af7a686076f5
 2016-05-19 22:46:55 +00:00
Bert McMeen
4cdad3212e docs: Update to column widths for Complications table 
am: 76372f02fe

* commit '76372f02fe149aefccea502bf1ac0dca2693e84b':
  docs: Update to column widths for Complications table

Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e
 2016-05-19 22:44:13 +00:00
John Reck
a7895725f8 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 
am: 8238207ce6  -s ours

* commit '8238207ce6268422bcdb50d44f03e6a220081294':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
 2016-05-19 22:43:14 +00:00
Abhijith Shastry
07abc7f813 Merge "Update BlockedNumberContract javadocs." into nyc-dev 2016-05-19 22:43:12 +00:00
John Reck
8238207ce6 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d 
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
 2016-05-19 22:37:04 +00:00
Hemal Patel
b40e1aa065 Docs: Fixed a typo 
Bug: 27583289
Change-Id: Ice0208182d98bb9e55343a915907c2b86a0bba65
 2016-05-19 15:36:09 -07:00