OSDN Git Service
Jeff Sharkey [Thu, 16 Jan 2014 20:46:37 +0000 (12:46 -0800)]
Run finalizers before counting for StrictMode.
Otherwise we sometimes end up counting objects strongly referenced
by the finalizer queue, and falsely detecting an instance leak.
Bug:
12533002
Change-Id: I144c941a3dfb0cbb837b98e80d2f49ffc9ca13c7
Jeff Sharkey [Sat, 11 Jan 2014 00:27:19 +0000 (16:27 -0800)]
Detect removable and emulated secondary storage.
Also rename existing secondary storage API to match naming
convention in rest of class.
Bug:
11536709
Change-Id: I2684c817de4982b414893d2d9927a21e3f171d53
quddusc [Thu, 16 Jan 2014 00:47:37 +0000 (00:47 +0000)]
am
e014eb63: am
fc6b772f: am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
e014eb6368f380545113fc115a6002da2d124726':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am
fc6b772f: am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
fc6b772f788e578ad84f21229120a6fe103d7282':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:41:59 +0000 (00:41 +0000)]
am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
bf6d079783a48b9e0a05d9fc650d04c324c431a7':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:38:46 +0000 (16:38 -0800)]
am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
2f1c2e32301018f800e0200c2d7ec01f990e0050':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:36:27 +0000 (00:36 +0000)]
am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
Ricardo Cervera [Thu, 16 Jan 2014 00:34:05 +0000 (00:34 +0000)]
am
b5466418: am
7984122e: am
04666c91: am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-
* commit '
b5466418d1313c59801a4acafa17b86ee4950f50':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
Ricardo Cervera [Thu, 16 Jan 2014 00:30:36 +0000 (00:30 +0000)]
am
7984122e: am
04666c91: am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
7984122e5e2fbb516e43ccc0cbc3211a82197ca7':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:27:29 +0000 (00:27 +0000)]
am
04666c91: am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
04666c91808c5e5efa39d9a490b6f18161e65968':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:24:18 +0000 (16:24 -0800)]
am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
96f6ce38e383c0a2d416678bdfce41426e3f6b45':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Dirk Dougherty [Thu, 16 Jan 2014 00:23:24 +0000 (00:23 +0000)]
am
e913f18c: am
26f9d980: am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
e913f18c5a7088ef69e5f87f75938d3cea2fd337':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:23:19 +0000 (00:23 +0000)]
am
061dc1b6: am
b888739d: am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
061dc1b6fbc2a56a987f093403855a370e705833':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Ricardo Cervera [Thu, 16 Jan 2014 00:20:55 +0000 (00:20 +0000)]
am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Dirk Dougherty [Thu, 16 Jan 2014 00:20:16 +0000 (00:20 +0000)]
am
26f9d980: am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
26f9d980575d0e1e8857f1491547094843f409b9':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:20:11 +0000 (00:20 +0000)]
am
b888739d: am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
b888739d3857e26308942574363e072d5cfbcbad':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Ricardo Cervera [Thu, 16 Jan 2014 00:19:07 +0000 (00:19 +0000)]
Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:17:18 +0000 (00:17 +0000)]
am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
7be6af670e25db5390bb5d79bc1a35973bd0c5aa':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:17:13 +0000 (00:17 +0000)]
am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
dd8def1e15bf0726ea087f46f91c0f1d533621c9':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:14:13 +0000 (16:14 -0800)]
am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
d7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:14:07 +0000 (16:14 -0800)]
am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:10:38 +0000 (00:10 +0000)]
am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
57801123c16a160d03dd265ca2f193b51e876186':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:10:34 +0000 (00:10 +0000)]
am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
6ec44a882b87fffb37e9dbafe8c5535f16faf349':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:08:53 +0000 (00:08 +0000)]
Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
Wink Saville [Thu, 16 Jan 2014 00:06:02 +0000 (00:06 +0000)]
am
9bc74c4b: am
ab092bb0: am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
9bc74c4b20bc0c88d01b832517122c28439aa406':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Thu, 16 Jan 2014 00:03:13 +0000 (00:03 +0000)]
am
ab092bb0: am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
ab092bb065b09ac0caa000269025c5a5ec951973':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Thu, 16 Jan 2014 00:00:18 +0000 (00:00 +0000)]
am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
469881381b081157b95e8e5ee3c9293bbbc1c852':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:57:10 +0000 (15:57 -0800)]
am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
5775697029760ca886a287ef2c3119d5097ded56':
Fixed mistaken reference to "LTE". Bug
7637224
quddusc [Wed, 15 Jan 2014 23:52:33 +0000 (23:52 +0000)]
am
9fa2cf62: am
cf280856: am
f6490353: am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
9fa2cf62155d128dc6594662ffa57f13beffcaf9':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:52:27 +0000 (23:52 +0000)]
am
e0ed54cc: am
18ae7b08: am
dba65d6f: am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
e0ed54cc53363a4fe16dc50f08a88d7f22fc68b1':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Wink Saville [Wed, 15 Jan 2014 23:49:14 +0000 (15:49 -0800)]
am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
a6aa3199bdb676e349c28b861a04c34a4ec136e0':
Fixed mistaken reference to "LTE". Bug
7637224
quddusc [Wed, 15 Jan 2014 23:47:45 +0000 (23:47 +0000)]
am
cf280856: am
f6490353: am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
cf280856d69a63b61bc4c5e8e61033174273fb9b':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:47:39 +0000 (23:47 +0000)]
am
18ae7b08: am
dba65d6f: am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
18ae7b0846a70be3e9cad1741130699e10ea5ca5':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Fixed mistaken reference to "LTE". Bug
7637224"
quddusc [Wed, 15 Jan 2014 23:43:52 +0000 (23:43 +0000)]
am
f6490353: am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
f6490353833bba0826d5a21f3b41b451135da4e6':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:43:47 +0000 (23:43 +0000)]
am
dba65d6f: am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
dba65d6fb5b9489ac5434ce3eece7f66227442f1':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:40:55 +0000 (15:40 -0800)]
am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:40:50 +0000 (15:40 -0800)]
am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
57edc17c398b3b438e1a3264219a6fa7f444341a':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:37:08 +0000 (23:37 +0000)]
am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
bf43ef272ad386ad89d115ab8be1b706ae29034e':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:37:04 +0000 (23:37 +0000)]
am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:34:49 +0000 (23:34 +0000)]
Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
Ricardo Cervera [Wed, 15 Jan 2014 23:16:30 +0000 (15:16 -0800)]
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890
HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9
quddusc [Wed, 4 Dec 2013 03:31:14 +0000 (19:31 -0800)]
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8
Chet Haase [Wed, 15 Jan 2014 22:10:00 +0000 (22:10 +0000)]
Merge "Fix bug in PathMeasure with trimmed paths"
Igor Murashkin [Wed, 15 Jan 2014 21:30:24 +0000 (21:30 +0000)]
Merge "camera2: @hide android.statistics.predictedColor*"
Igor Murashkin [Wed, 15 Jan 2014 21:20:37 +0000 (13:20 -0800)]
camera2: @hide android.statistics.predictedColor*
Change-Id: I8c1b7596c1e0c311a4f9fabdd5de72b4b7b372b5
Ricardo Cervera [Wed, 15 Jan 2014 21:21:00 +0000 (21:21 +0000)]
am
0f38580f: am
6150b2c6: am
4f216e1d: am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
0f38580febcf9f2d71f7c1067cb00fe3b3f4476a':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:18:07 +0000 (21:18 +0000)]
am
6150b2c6: am
4f216e1d: am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
6150b2c6ac95dc9b0bd3556d6e542402b5899da6':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:13:41 +0000 (21:13 +0000)]
am
4f216e1d: am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
4f216e1db9c01e5bbdf461fe25d41bad2874c082':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:11:13 +0000 (13:11 -0800)]
am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
c919f4f47787245ddda32d0e41e7bae0facd0ee8':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:07:21 +0000 (21:07 +0000)]
am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
bab2235ae89e37452e9be8a8b6d2581fe59e0162':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:03:54 +0000 (21:03 +0000)]
Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
John Spurlock [Wed, 15 Jan 2014 21:00:16 +0000 (21:00 +0000)]
Merge "Tear down bars on destroy() and avoid null pointers."
Igor Murashkin [Wed, 15 Jan 2014 20:27:41 +0000 (12:27 -0800)]
camera2: Fix @see being emitted into middle of javadoc (+more)
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
markdown, causing spurious <code> blocks to be emitted
Bug:
12552669
Change-Id: I4c6615ec47810757b8348995db2b199222a3a77e
Chet Haase [Wed, 15 Jan 2014 19:45:25 +0000 (11:45 -0800)]
Fix bug in PathMeasure with trimmed paths
Logic in the hardware renderer optimizes path rendering for simple
paths that consist of only rectangles. Any operation on the path that
adds any other primitive sets the simplicity flag to false appropriately.
PathMeasure.getSegment(), however, avoids those code paths and never sets
the mIsSimple flag at all, so it returns its original value (true, if the
path was simply constructed with no operations before being used in the
getSegment() call).
The fix is to avoid the optimization for paths used in getSegment(), since
it's not clear what operations will end up in the path and it's likely not
going to be just simple rectangles in any case.
Issue #
12533902 PathMeasure.getSegment is broken
Change-Id: I71e77207e4d5c649c326557d33eba31e9b0fd45e
Jeff Hao [Wed, 15 Jan 2014 19:50:53 +0000 (19:50 +0000)]
am
ac20b469: am
6c13f384: am
56b11064: am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
ac20b469259129df948bae1fa5434098b1801185':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:48:18 +0000 (19:48 +0000)]
am
6c13f384: am
56b11064: am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
6c13f384749150e9fa6f930023a9161fe97402d0':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:45:06 +0000 (19:45 +0000)]
am
56b11064: am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
56b110649424534de36ca41b3e352a73b6bdf3c0':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:41:30 +0000 (11:41 -0800)]
am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:38:01 +0000 (11:38 -0800)]
am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:34:39 +0000 (19:34 +0000)]
Merge "Add sample profiling interface to startMethodTracing."
Zhijun He [Wed, 15 Jan 2014 19:31:30 +0000 (11:31 -0800)]
Camera2: Update awbMode related javadoc spec
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
Jeff Hao [Mon, 6 Jan 2014 23:52:52 +0000 (15:52 -0800)]
Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.
Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
Ricardo Cervera [Wed, 15 Jan 2014 19:25:10 +0000 (11:25 -0800)]
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
Leon Scroggins III [Wed, 15 Jan 2014 19:24:39 +0000 (19:24 +0000)]
Merge "Fix Javadoc build break."
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
Fix Javadoc build break.
Remove links to non-specific function name.
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
John Spurlock [Wed, 15 Jan 2014 19:13:59 +0000 (14:13 -0500)]
Tear down bars on destroy() and avoid null pointers.
Change-Id: Ie393689bbf2f0b28895bfde5098c883b5d4ea4a6
John Reck [Wed, 15 Jan 2014 18:57:13 +0000 (18:57 +0000)]
Merge "Remove dead code"
Leon Scroggins III [Wed, 15 Jan 2014 18:34:18 +0000 (18:34 +0000)]
Merge "Remove calls to deprecated SkBitmap::setIsOpaque()"
Geoff Mendal [Wed, 15 Jan 2014 18:24:04 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 15 Jan 2014 18:12:52 +0000 (10:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0116e137efa21bd9e8e3ba65fa05c7d84afb9e2c
Auto-generated-cl: translation import
quddusc [Wed, 15 Jan 2014 18:11:32 +0000 (18:11 +0000)]
am
4645edea: am
25e1900b: am
e8ae214c: am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
4645edeae0eec727909bcfe1ff7562ca4a7d1c80':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 18:08:32 +0000 (18:08 +0000)]
am
25e1900b: am
e8ae214c: am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
25e1900beee4959be28ede9e00b8c5e8f10c1e17':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 18:04:31 +0000 (18:04 +0000)]
am
e8ae214c: am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 18:00:53 +0000 (10:00 -0800)]
am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
f40111731581f03dc1b447b432331b3415fb87b9':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
Glenn Kasten [Wed, 15 Jan 2014 17:58:52 +0000 (17:58 +0000)]
Merge "Unhide android.media.AudioTrack.setVolume(float)"
quddusc [Wed, 15 Jan 2014 17:57:27 +0000 (17:57 +0000)]
am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
31573d45933886237dd6414978486b79a4dd4f9f':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 17:55:21 +0000 (17:55 +0000)]
Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
John Reck [Wed, 15 Jan 2014 17:37:38 +0000 (09:37 -0800)]
Remove dead code
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
Marco Nelissen [Wed, 15 Jan 2014 17:33:42 +0000 (17:33 +0000)]
am
4e53edf7: am
e495a5a3: am
cb15fb60: am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
4e53edf7ea8f8158a123a451530146f23e3fed81':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:29:43 +0000 (17:29 +0000)]
am
e495a5a3: am
cb15fb60: am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
e495a5a3f3feec6319262a6bdab3b7704d6ab843':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:27:19 +0000 (17:27 +0000)]
am
cb15fb60: am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
cb15fb6041e604025d4b76645435f8cbafee754c':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:22:55 +0000 (09:22 -0800)]
am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
0d4916f19f81f80fc83eb7646c6d339630d5f618':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:19:52 +0000 (09:19 -0800)]
am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
c3036a12467395465b86e6935af8aa500c1b128d':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:17:05 +0000 (17:17 +0000)]
Merge "Before requerying a cursor, check if it is closed."
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
Michael Jurka [Wed, 15 Jan 2014 12:52:07 +0000 (12:52 +0000)]
Merge "Centering the crop by default in system wallpaper cropper"
Scott Main [Fri, 6 Dec 2013 20:57:13 +0000 (12:57 -0800)]
Doc change: add Drive API feature page.
fix link text on several pages
Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
Alan Viverette [Wed, 15 Jan 2014 02:24:44 +0000 (02:24 +0000)]
Merge "Propagate first call to DrawableContainer.setAlpha() to children"
Alan Viverette [Wed, 15 Jan 2014 02:19:09 +0000 (18:19 -0800)]
Propagate first call to DrawableContainer.setAlpha() to children
BUG:
12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
Zhijun He [Wed, 15 Jan 2014 02:12:13 +0000 (18:12 -0800)]
Camera2: Update AF mode related javadoc specs
Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd
Zhijun He [Wed, 15 Jan 2014 01:57:23 +0000 (17:57 -0800)]
Camera2: metadata tag javadoc update
Change-Id: I66700340780f3185796f25c054487f439f24a6fb
Alan Viverette [Wed, 15 Jan 2014 01:31:00 +0000 (01:31 +0000)]
Merge "Cache display lists for Drawables"
Glenn Kasten [Wed, 15 Jan 2014 01:27:58 +0000 (01:27 +0000)]
Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"
Jason Sams [Wed, 15 Jan 2014 01:23:50 +0000 (01:23 +0000)]
Merge "Check that bound allocations are 1D"
Alan Viverette [Wed, 15 Jan 2014 01:16:29 +0000 (17:16 -0800)]
Cache display lists for Drawables
Change-Id: I86e2dd4cd4ac8871f4131450cb9082c2b8de2eed
Craig Mautner [Wed, 15 Jan 2014 01:10:51 +0000 (01:10 +0000)]
am
9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev
* commit '
9cfb2e5f4c95c16d8ca531808f60486f214f9039':
Retain stacks even if they are empty.
Adrian Roos [Wed, 15 Jan 2014 01:10:32 +0000 (01:10 +0000)]
Merge "Make brightness panel behave like volume panel."
OSDN Git Service
