drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,585 Commits 1 Branch 0 Tags
Commit Graph

185585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
e5ef28f509 Add two utility methods for IPv4 netmasks. 
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
 2015-03-20 16:32:34 +09:00
Zach Riggle
3a96f767c3 am 685d33dd: am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '685d33dd18aba2c9ceb7586a638ec7850c1872a7':
  Fix NPE in FlashlightController
 2015-03-19 23:50:59 +00:00
Zach Riggle
685d33dd18 am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
  Fix NPE in FlashlightController
 2015-03-19 23:42:58 +00:00
Yang Ni
4778caae50 am 53699ec6: am d3e6428a: Merge "New API methods for Script Group" 
* commit '53699ec613acf76277b69db57bf2f378d0dc374a':
  New API methods for Script Group
 2015-03-19 23:42:34 +00:00
Zach Riggle
104a29b6b5 am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController
 2015-03-19 23:35:20 +00:00
Yang Ni
53699ec613 am d3e6428a: Merge "New API methods for Script Group" 
* commit 'd3e6428aea34ce3297123c63b4dd6223dac5d5a8':
  New API methods for Script Group
 2015-03-19 23:35:14 +00:00
Craig Mautner
efadd572b9 Merge "Fix bad nesting count when remote calls fail." 2015-03-19 23:31:52 +00:00
Chris Craik
49911ce732 Merge "Avoid throwing ISE in Canvas#restore underflow" 2015-03-19 23:29:58 +00:00
Zach Riggle
a7dbe970bc am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController
 2015-03-19 23:29:06 +00:00
smain@google.com
0a74aac1ef am 62c595aa: am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '62c595aaee29d88c7ae0694f8aeb83179f33150c':
  add Places API to the Location feature page
 2015-03-19 23:27:14 +00:00
Zach Riggle
901e400826 am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
 2015-03-19 23:22:10 +00:00
Yang Ni
d3e6428aea Merge "New API methods for Script Group" 2015-03-19 23:21:28 +00:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
 2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
Dianne Hackborn
79ec42e6a3 Merge "First stab at device idle mode." 2015-03-19 23:05:16 +00:00
smain@google.com
62c595aaee am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
  add Places API to the Location feature page
 2015-03-19 22:55:38 +00:00
smain@google.com
6784cf9945 am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page
 2015-03-19 22:48:07 +00:00
smain@google.com
092a789377 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
 2015-03-19 22:42:44 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
 2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
 2015-03-19 22:29:09 +00:00
Bo Liu
4dd12ef0c5 Merge "Remove debug logging from WebView" 2015-03-19 22:28:03 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
 2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Chris Craik
14cfb6db33 Avoid throwing ISE in Canvas#restore underflow 
bug:19829784

Change-Id: I5829a7783ad912c09c83dee17bad10b90f42aace
 2015-03-19 15:11:38 -07:00
Paul Mclean
3756b40992 Merge "AudioService: fix crash when mediaserver killed" 2015-03-19 22:02:42 +00:00
Phil Burk
413d307c2c AudioService: fix crash when mediaserver killed 
Bug: 19847028
Change-Id: I4acacd8a6d20317d180a6994158abc0b2957280c
Signed-off-by: Phil Burk <philburk@google.com>
 2015-03-19 14:59:20 -07:00
Yang Ni
c6dbfececd am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to convention" 
* commit 'f2ea01717b918471b050bea46529e1843d36fc84':
  Added copyright notice and formatted to convention
 2015-03-19 21:47:31 +00:00
Yang Ni
f2ea01717b am c077ee31: Merge "Added copyright notice and formatted to convention" 
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention
 2015-03-19 21:41:59 +00:00
Yang Ni
8ff2980f31 New API methods for Script Group 
Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.

Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
 2015-03-19 14:38:20 -07:00
Bryce Lee
9fc0b6fb1f am b45d3926: am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 
* commit 'b45d3926f327948c486c92ddc7fdb97dbc98e401':
  Fix wrong intent being passed in PhoneWindowManager.
 2015-03-19 21:37:45 +00:00
Bryce Lee
b45d3926f3 am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 
* commit '8320cf2de357265179c3007256394b0cbb69d949':
  Fix wrong intent being passed in PhoneWindowManager.
 2015-03-19 21:30:43 +00:00
Yang Ni
c077ee316e Merge "Added copyright notice and formatted to convention" 2015-03-19 21:28:13 +00:00
Bryce Lee
8320cf2de3 Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 2015-03-19 21:24:52 +00:00
Bo Liu
17a7989904 Remove debug logging from WebView 
Moving them to chromium:
https://codereview.chromium.org/1022993002/

Change-Id: I6a9294b7041e9768397a624e5c174b22f4085e87
 2015-03-19 14:19:29 -07:00
Guang Zhu
8d09a7445e Merge "pass stream contents in separate thread for executeShellCommand" 2015-03-19 21:14:15 +00:00
Joe Fernandez
d81e0056f5 am 33e84c16: am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '33e84c167863745514b56b97c391f8d8913ca05e':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 21:04:19 +00:00
Joe Fernandez
3c48647e4a am 58273493: am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK re 
* commit '5827349328bd3f647c55ba271ec4f87e96a25ced':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 21:04:12 +00:00
Joe Fernandez
b032c39a8b am b89cdf1e: am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'b89cdf1ef452db6f21a94c8e122091b74833e3f3':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 21:04:03 +00:00
Joe Fernandez
33e84c1678 am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:56:45 +00:00
Joe Fernandez
5827349328 am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int 
* commit '1e81b070f772fdef45d7bedc0de0304603e05a95':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:56:33 +00:00
Joe Fernandez
b89cdf1ef4 am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '5c1a3ab4216333696947eefee4d022f708e4c053':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:56:25 +00:00
Miao Wang
815bcb24b0 am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:54:40 +00:00
Eric Gilmore
4496b0a539 am 3e90fa59: am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '3e90fa590857e43f0ed86eac18f0b02afca44b88':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:54:31 +00:00
Joe Fernandez
8ca83e0504 am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:49:52 +00:00
Joe Fernandez
1e81b070f7 am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:49:48 +00:00
Joe Fernandez
5c1a3ab421 am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:49:41 +00:00
Miao Wang
f8a69f562b am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:49:15 +00:00
Eric Gilmore
3e90fa5908 am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '680f36a88ff1c43e928066122505ec05c50d9942':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:46:28 +00:00
Joe Fernandez
0362d6e0c8 am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:42:36 +00:00
Joe Fernandez
e41abf4a30 am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:42:30 +00:00