OSDN Git Service
Craig Mautner [Fri, 15 Feb 2013 03:58:44 +0000 (19:58 -0800)]
am
22ee9aad: Merge "Reset and reuse Iterators and don\'t new() one."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
22ee9aad834b055df1bd5d5544e37a63edc963fe':
Reset and reuse Iterators and don't new() one.
Kenny Root [Fri, 15 Feb 2013 03:58:33 +0000 (19:58 -0800)]
am
0786207b: am
dc7b3e3b: am
9657ba0e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (2) and others
* commit '
0786207be59d34a8ba8a7a1e93602002fac97587':
KeyStore: stop using state()
Kristian Monsen [Fri, 15 Feb 2013 03:48:27 +0000 (19:48 -0800)]
resolved conflicts for merge of
58a1ca66 to master-chromium
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
Craig Mautner [Thu, 14 Feb 2013 22:21:52 +0000 (22:21 +0000)]
Merge "Reset and reuse Iterators and don't new() one."
Kenny Root [Thu, 14 Feb 2013 20:50:34 +0000 (12:50 -0800)]
am
dc7b3e3b: am
9657ba0e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (1) and others
* commit '
dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
KeyStore: stop using state()
Craig Mautner [Thu, 14 Feb 2013 06:37:26 +0000 (22:37 -0800)]
Reset and reuse Iterators and don't new() one.
Save time and memory by resuing permanent mTmpXxxIterator for
AllWindowsIterator and AppTokenIterator.
Change-Id: I2e5143364651d9471e9e70eee514d3f45d595468
Kenny Root [Thu, 14 Feb 2013 20:48:18 +0000 (12:48 -0800)]
am
9657ba0e: Merge "KeyStore: stop using state()"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
9657ba0edc8bab5a36c26bcd94366149aed63331':
KeyStore: stop using state()
Mathias Agopian [Thu, 14 Feb 2013 20:25:08 +0000 (20:25 +0000)]
Merge "split Surface in two classes: SurfaceControl and Surface"
Mathias Agopian [Thu, 14 Feb 2013 20:25:07 +0000 (12:25 -0800)]
am
a41b23d5: Merge "get rid of Surface.getIdentity()"
# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit '
a41b23d55da1bd8e68eb784f28e2c3fe9ded080e':
get rid of Surface.getIdentity()
Mathias Agopian [Thu, 14 Feb 2013 20:22:24 +0000 (20:22 +0000)]
Merge "get rid of Surface.getIdentity()"
Mathias Agopian [Tue, 12 Feb 2013 06:08:48 +0000 (22:08 -0800)]
split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.
Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
Kenny Root [Thu, 14 Feb 2013 20:18:09 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"
Dirk Dougherty [Thu, 14 Feb 2013 20:13:31 +0000 (12:13 -0800)]
am
dfb306b2: am
f16de3f3: am
0f4a378d: am
da9ac596: am
9a93e079: am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (5) and Dirk Dougherty (1)
* commit '
dfb306b2bc0adbec29e7ccd1a8ecb92502497573':
Doc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 20:11:30 +0000 (12:11 -0800)]
am
f16de3f3: am
0f4a378d: am
da9ac596: am
9a93e079: am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '
f16de3f3f622a04d48cd595c76165ac60a3efcfa':
Doc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 20:09:16 +0000 (12:09 -0800)]
am
0f4a378d: am
da9ac596: am
9a93e079: am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '
0f4a378dc7da59a4fe45c111c09f52696dbb6476':
Doc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 20:07:39 +0000 (12:07 -0800)]
am
da9ac596: am
9a93e079: am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
da9ac596a171ff46a241f52a89015a0090e9ba18':
Doc change: add notice for iab v3 subscriptions launch.
Kenny Root [Thu, 14 Feb 2013 18:18:38 +0000 (10:18 -0800)]
KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
Dirk Dougherty [Thu, 14 Feb 2013 20:05:49 +0000 (12:05 -0800)]
am
9a93e079: am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
9a93e079791b7a94ca62a08963ff18951429700e':
Doc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 20:03:35 +0000 (12:03 -0800)]
am
f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Dirk Dougherty
* commit '
f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
Doc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 19:47:36 +0000 (11:47 -0800)]
Doc change: add notice for iab v3 subscriptions launch.
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
Craig Mautner [Thu, 14 Feb 2013 19:43:49 +0000 (11:43 -0800)]
am
3beb8757: Merge "Remove AppWindowToken lists."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
3beb8757ac9ba0829bf96e067ae32315f1d4bb3f':
Remove AppWindowToken lists.
Craig Mautner [Thu, 14 Feb 2013 19:40:23 +0000 (19:40 +0000)]
Merge "Remove AppWindowToken lists."
Russell Brenner [Thu, 14 Feb 2013 19:36:46 +0000 (11:36 -0800)]
am
b3d71a10: Merge "Adjust captive portal test for setup wizard"
# Via Android (Google) Code Review (1) and Russell Brenner (1)
* commit '
b3d71a106e9f142ffe3ee901c63dac91640a74b9':
Adjust captive portal test for setup wizard
Russell Brenner [Thu, 14 Feb 2013 19:31:45 +0000 (19:31 +0000)]
Merge "Adjust captive portal test for setup wizard"
Russell Brenner [Tue, 12 Feb 2013 18:03:14 +0000 (10:03 -0800)]
Adjust captive portal test for setup wizard
During setup wizard, perform captive portal test without the typical
delays.
Change-Id: If596948e732966817aae6201440e87e19be0c2f8
Craig Mautner [Thu, 14 Feb 2013 17:32:55 +0000 (09:32 -0800)]
Remove AppWindowToken lists.
No longer necessary.
Change-Id: I0d2b96f69152fb93b6ba56f02ce9693ff1370cbc
Romain Guy [Thu, 14 Feb 2013 18:54:21 +0000 (10:54 -0800)]
am
10c0aa24: Merge "Implement support for drawBitmapMesh\'s colors array"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
10c0aa246d9b2633c6cb4e5b714abb0031a4f4cd':
Implement support for drawBitmapMesh's colors array
Romain Guy [Thu, 14 Feb 2013 18:49:34 +0000 (18:49 +0000)]
Merge "Implement support for drawBitmapMesh's colors array"
Craig Mautner [Thu, 14 Feb 2013 18:39:35 +0000 (10:39 -0800)]
am
45dc56f3: Merge "Fix build."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
45dc56f3cc6cf890d2f8a28021f46ad1e9028f5e':
Fix build.
Craig Mautner [Thu, 14 Feb 2013 18:36:10 +0000 (18:36 +0000)]
Merge "Fix build."
Craig Mautner [Thu, 14 Feb 2013 18:33:42 +0000 (10:33 -0800)]
Fix build.
Change-Id: I6fb00530536e5203d89805141792289ed7c1d8e3
Craig Mautner [Thu, 14 Feb 2013 18:16:57 +0000 (10:16 -0800)]
am
534d136a: Merge "Remove unused App methods."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
534d136aa66fb13f7c1b482513627de45c218c29':
Remove unused App methods.
Craig Mautner [Thu, 14 Feb 2013 18:13:14 +0000 (18:13 +0000)]
Merge "Remove unused App methods."
Robert Greenwalt [Thu, 14 Feb 2013 16:46:28 +0000 (08:46 -0800)]
am
fd869887: Merge "Fix a permissions probem in ConnectivityManager"
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit '
fd869887c3477bb2699b72ea752a8466602ea637':
Fix a permissions probem in ConnectivityManager
Robert Greenwalt [Thu, 14 Feb 2013 16:43:33 +0000 (16:43 +0000)]
Merge "Fix a permissions probem in ConnectivityManager"
Craig Mautner [Thu, 14 Feb 2013 06:23:40 +0000 (22:23 -0800)]
am
f0b36c55: Merge "Refactor setAppOpVisibility implementation."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
f0b36c559074718c5e932c20a9931d97d9c061ef':
Refactor setAppOpVisibility implementation.
Craig Mautner [Thu, 14 Feb 2013 06:21:19 +0000 (06:21 +0000)]
Merge "Refactor setAppOpVisibility implementation."
Jason Sams [Thu, 14 Feb 2013 02:48:21 +0000 (18:48 -0800)]
am
30d2f8d6: Merge "Convert live preview demo to IO_OUTPUT"
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '
30d2f8d6e0c26dd32dc8b737170253f015156591':
Convert live preview demo to IO_OUTPUT
Jason Sams [Thu, 14 Feb 2013 02:45:40 +0000 (02:45 +0000)]
Merge "Convert live preview demo to IO_OUTPUT"
Romain Guy [Thu, 14 Feb 2013 02:39:43 +0000 (18:39 -0800)]
Implement support for drawBitmapMesh's colors array
Change-Id: I3d901f6267c2918771ac30ff55c8d80c3ab5b725
Jeff Sharkey [Thu, 14 Feb 2013 02:18:07 +0000 (18:18 -0800)]
am
7e72a693: Merge "Remove sscanf() warnings when parsing stats."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '
7e72a693cfe2facc701d7202d91c211d212ce20e':
Remove sscanf() warnings when parsing stats.
Jeff Sharkey [Thu, 14 Feb 2013 02:14:31 +0000 (18:14 -0800)]
am
aec6bcfb: Merge "Parse network stats using native code."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '
aec6bcfb767a4b9dfd391bff338a8ff284b29549':
Parse network stats using native code.
Jeff Sharkey [Thu, 14 Feb 2013 02:13:31 +0000 (02:13 +0000)]
Merge "Remove sscanf() warnings when parsing stats."
Jeff Sharkey [Sat, 9 Feb 2013 00:10:21 +0000 (16:10 -0800)]
Remove sscanf() warnings when parsing stats.
Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
Jeff Sharkey [Thu, 14 Feb 2013 02:12:19 +0000 (02:12 +0000)]
Merge "Parse network stats using native code."
Daniel Sandler [Thu, 14 Feb 2013 01:55:15 +0000 (17:55 -0800)]
am
2977a30e: Merge "More debug logs for stuck statusbars."
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '
2977a30ef422f2be4a5ef74dd1a5a32a6a8f994b':
More debug logs for stuck statusbars.
Daniel Sandler [Thu, 14 Feb 2013 01:49:59 +0000 (01:49 +0000)]
Merge "More debug logs for stuck statusbars."
Daniel Sandler [Wed, 13 Feb 2013 22:15:57 +0000 (17:15 -0500)]
More debug logs for stuck statusbars.
Bug:
7686690
Change-Id: Ic58d90a56412579cad0c77f5787a6fc4193a32d1
Jeff Sharkey [Tue, 15 Jan 2013 00:48:51 +0000 (16:48 -0800)]
Parse network stats using native code.
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.
Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
Fabrice Di Meglio [Thu, 14 Feb 2013 01:38:31 +0000 (17:38 -0800)]
am
336fcac3: Merge "Fix bug #
8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
336fcac31ddccc7e7a6773d03e7cb17967ebb898':
Fix bug #
8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey
Fabrice Di Meglio [Thu, 14 Feb 2013 01:35:53 +0000 (01:35 +0000)]
Merge "Fix bug #
8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
Fabrice Di Meglio [Thu, 14 Feb 2013 01:22:52 +0000 (17:22 -0800)]
Fix bug #
8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey
- remove remaining dirFlags
- clean method names
Change-Id: I404b643cd10321e977530528168d1d415b3f2eca
quddusc [Thu, 14 Feb 2013 01:21:38 +0000 (17:21 -0800)]
am
66a4d9cd: am
6b4d73c9: am
cdcc2e58: am
68785da7: am
62bd2319: am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '
66a4d9cd33b2d253b71acaa9142c66be17ce66e4':
docs: Updated In-app Billing docs to support subscriptions for V3.
quddusc [Thu, 14 Feb 2013 01:19:31 +0000 (17:19 -0800)]
am
6b4d73c9: am
cdcc2e58: am
68785da7: am
62bd2319: am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
6b4d73c985996cf3fd1333edc073b5260c9d897e':
docs: Updated In-app Billing docs to support subscriptions for V3.
quddusc [Thu, 14 Feb 2013 01:17:07 +0000 (17:17 -0800)]
am
cdcc2e58: am
68785da7: am
62bd2319: am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
docs: Updated In-app Billing docs to support subscriptions for V3.
quddusc [Thu, 14 Feb 2013 01:15:33 +0000 (17:15 -0800)]
am
68785da7: am
62bd2319: am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
68785da7a052c75f73f3857ed97b74c3c03883c0':
docs: Updated In-app Billing docs to support subscriptions for V3.
quddusc [Thu, 14 Feb 2013 01:14:37 +0000 (17:14 -0800)]
am
62bd2319: am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
62bd23190bdf559c6297ddcc991d18449c2e9d48':
docs: Updated In-app Billing docs to support subscriptions for V3.
Kenny Root [Thu, 14 Feb 2013 01:13:35 +0000 (17:13 -0800)]
am
1247c0a1: am
a276589b: am
37edbbc6: Merge "VpnDialogs: filter obscured touches"
# Via Android Git Automerger (2) and others
* commit '
1247c0a11d54478158dafcaeedd7e49a6b99fb1f':
VpnDialogs: filter obscured touches
quddusc [Thu, 14 Feb 2013 01:12:40 +0000 (17:12 -0800)]
am
38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
# Via Android (Google) Code Review (1) and quddusc (1)
* commit '
38b6d7a15c6d5196f9b886f15dc58c28734300da':
docs: Updated In-app Billing docs to support subscriptions for V3.
Kenny Root [Thu, 14 Feb 2013 01:11:34 +0000 (17:11 -0800)]
am
a276589b: am
37edbbc6: Merge "VpnDialogs: filter obscured touches"
# Via Android Git Automerger (1) and others
* commit '
a276589ba5439e6b06a4f49de7420fbf45104c80':
VpnDialogs: filter obscured touches
quddusc [Thu, 14 Feb 2013 01:09:27 +0000 (01:09 +0000)]
Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev
Kenny Root [Thu, 14 Feb 2013 01:09:22 +0000 (17:09 -0800)]
am
37edbbc6: Merge "VpnDialogs: filter obscured touches"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
37edbbc62fa031c75ce5a1298fdd07d981907e89':
VpnDialogs: filter obscured touches
Mathias Agopian [Tue, 12 Feb 2013 01:00:13 +0000 (17:00 -0800)]
get rid of Surface.getIdentity()
Change-Id: I8b70d77cc1b38009ad71d92025c3beb481a18866
Michael Runge [Thu, 14 Feb 2013 00:54:35 +0000 (16:54 -0800)]
am
044dca28: Merge "Add logging for kernel audit failures, including SELinux."
# By Geremy Condra
# Via Android (Google) Code Review (1) and Geremy Condra (1)
* commit '
044dca285f567863a5ab345ac139f1fa31cac2cc':
Add logging for kernel audit failures, including SELinux.
Michael Runge [Thu, 14 Feb 2013 00:51:16 +0000 (00:51 +0000)]
Merge "Add logging for kernel audit failures, including SELinux."
Kenny Root [Thu, 14 Feb 2013 00:49:20 +0000 (00:49 +0000)]
Merge "VpnDialogs: filter obscured touches"
Chris Craik [Thu, 14 Feb 2013 00:45:46 +0000 (16:45 -0800)]
am
805a6fe7: Merge "Revert "Revert "Use RenderScript for large text blurs"""
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit '
805a6fe7b1417640ccaf7914171cb65515b6ab39':
Revert "Revert "Use RenderScript for large text blurs""
Jean-Michel Trivi [Thu, 14 Feb 2013 00:45:44 +0000 (16:45 -0800)]
am
4627a47d: Merge "Remove obsolete imports"
# Via Android (Google) Code Review
* commit '
4627a47d94a5322b9a3cea02645929b260a6ee16':
Remove obsolete imports
quddusc [Fri, 8 Feb 2013 01:16:33 +0000 (17:16 -0800)]
docs: Updated In-app Billing docs to support subscriptions for V3.
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
Chris Craik [Thu, 14 Feb 2013 00:44:12 +0000 (00:44 +0000)]
Merge "Revert "Revert "Use RenderScript for large text blurs"""
Jean-Michel Trivi [Thu, 14 Feb 2013 00:42:42 +0000 (00:42 +0000)]
Merge "Remove obsolete imports"
Chris Craik [Thu, 14 Feb 2013 00:14:17 +0000 (16:14 -0800)]
Revert "Revert "Use RenderScript for large text blurs""
This reverts commit
bf5703e52e3304246cbf0e73f6976f7d7312d238.
Change-Id: Ic6f991277dec9e80a6fed93db91499726b30ab2a
Geremy Condra [Thu, 14 Feb 2013 00:07:21 +0000 (16:07 -0800)]
Add logging for kernel audit failures, including SELinux.
Bug:
7707280
Change-Id: I3788b465cb5733c93dbf36c91ce26e37d4be41c2
Kenny Root [Thu, 14 Feb 2013 00:32:36 +0000 (16:32 -0800)]
VpnDialogs: filter obscured touches
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
Jason Sams [Fri, 1 Feb 2013 20:48:58 +0000 (12:48 -0800)]
Convert live preview demo to IO_OUTPUT
Change-Id: I01193932a6fcd572841434a59d34eda60d9b8b02
Fix aspect ratio
Kenny Root [Thu, 14 Feb 2013 00:04:06 +0000 (16:04 -0800)]
am
0c868858: am
fbed306f: am
b0f4b8a7: Merge "Track keystore binder changes"
# Via Android Git Automerger (2) and others
* commit '
0c86885888512b120e8691164799e06adb653b72':
Track keystore binder changes
Kenny Root [Thu, 14 Feb 2013 00:04:03 +0000 (16:04 -0800)]
am
3795f510: am
76e69417: am
8ab76778: Merge "KeyChain: return null instead of throw"
# Via Android Git Automerger (2) and others
* commit '
3795f510d313077308a065ae1fe15252d0e6d8b3':
KeyChain: return null instead of throw
Kenny Root [Thu, 14 Feb 2013 00:02:07 +0000 (16:02 -0800)]
am
fbed306f: am
b0f4b8a7: Merge "Track keystore binder changes"
# Via Android Git Automerger (1) and others
* commit '
fbed306fb9fe1a989a29c94d210e227ac07c2a03':
Track keystore binder changes
Kenny Root [Thu, 14 Feb 2013 00:02:04 +0000 (16:02 -0800)]
am
76e69417: am
8ab76778: Merge "KeyChain: return null instead of throw"
# Via Android Git Automerger (1) and others
* commit '
76e694172a16e346ff2ce783c3768176bd351319':
KeyChain: return null instead of throw
Kenny Root [Wed, 13 Feb 2013 23:58:49 +0000 (15:58 -0800)]
am
b0f4b8a7: Merge "Track keystore binder changes"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
b0f4b8a7d2662e8cc63dae1001175bf72bca1539':
Track keystore binder changes
Kenny Root [Wed, 13 Feb 2013 23:58:46 +0000 (15:58 -0800)]
am
8ab76778: Merge "KeyChain: return null instead of throw"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
8ab767786a3b59c72b613f84d40b181428327ac1':
KeyChain: return null instead of throw
Svetoslav [Wed, 13 Feb 2013 23:52:11 +0000 (15:52 -0800)]
am
a7d72dfd: Merge "Proper clean up when Ui test automation service is unregistered or dies."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '
a7d72dfded3437e05c303dc40d61248022eb048b':
Proper clean up when Ui test automation service is unregistered or dies.
Jason Sams [Wed, 13 Feb 2013 23:52:08 +0000 (15:52 -0800)]
am
0a4b65e0: Merge "Reuse context and allocations across test."
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '
0a4b65e0792c7e5f5e8ce641a899ed06cfa1cf64':
Reuse context and allocations across test.
Svetoslav [Wed, 13 Feb 2013 23:48:35 +0000 (23:48 +0000)]
Merge "Proper clean up when Ui test automation service is unregistered or dies."
Jason Sams [Wed, 13 Feb 2013 23:49:02 +0000 (23:49 +0000)]
Merge "Reuse context and allocations across test."
Svetoslav [Wed, 13 Feb 2013 23:47:29 +0000 (15:47 -0800)]
Proper clean up when Ui test automation service is unregistered or dies.
The UI test automation service was not removed from the list of
enabled and installed service where it was explicitly added on
registration. This was leaving the accessibility manager service
in an inconsistent state.
bug:
8185435
Change-Id: Ice17cdef361fe98ce34f8dd01ec11dbad6c4d0c2
Kenny Root [Wed, 13 Feb 2013 23:43:57 +0000 (23:43 +0000)]
Merge "Track keystore binder changes"
Kenny Root [Wed, 13 Feb 2013 23:39:04 +0000 (23:39 +0000)]
Merge "KeyChain: return null instead of throw"
Joe Fernandez [Wed, 13 Feb 2013 23:37:11 +0000 (15:37 -0800)]
am
4f763085: am
9b0aa6c9: am
35390a79: am
7421aeab: am
6978d04b: am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '
4f76308544423c67cccce51cef596f8dc428657e':
docs: SDK r21.1 - fix download links, Issue
8193979
Joe Fernandez [Wed, 13 Feb 2013 23:36:05 +0000 (15:36 -0800)]
am
9b0aa6c9: am
35390a79: am
7421aeab: am
6978d04b: am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
9b0aa6c906b22a91440ef5b980f6294c3dd42348':
docs: SDK r21.1 - fix download links, Issue
8193979
Joe Fernandez [Wed, 13 Feb 2013 23:33:39 +0000 (15:33 -0800)]
am
35390a79: am
7421aeab: am
6978d04b: am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
35390a7943b1a2826a95d6a2fe309089e04dd988':
docs: SDK r21.1 - fix download links, Issue
8193979
Joe Fernandez [Wed, 13 Feb 2013 23:31:19 +0000 (15:31 -0800)]
am
7421aeab: am
6978d04b: am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
7421aeab5a63ba343ece937a8b4b712e15d76bdc':
docs: SDK r21.1 - fix download links, Issue
8193979
Joe Fernandez [Wed, 13 Feb 2013 23:29:08 +0000 (15:29 -0800)]
am
6978d04b: am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
6978d04b444824dea6579e3352cf5cad7ffc7c6f':
docs: SDK r21.1 - fix download links, Issue
8193979
Joe Fernandez [Wed, 13 Feb 2013 23:27:09 +0000 (15:27 -0800)]
am
9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '
9d95873de1bdb024bcf50a51c5a6606a645f9d5d':
docs: SDK r21.1 - fix download links, Issue
8193979
Craig Mautner [Wed, 13 Feb 2013 23:25:23 +0000 (15:25 -0800)]
am
ee6e27c1: Merge "Stop using AppToken movement and start using Task."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
ee6e27c122491356f5203b105206a55f0e984fe7':
Stop using AppToken movement and start using Task.
Craig Mautner [Wed, 13 Feb 2013 23:22:54 +0000 (15:22 -0800)]
Remove unused App methods.
Now that the Task methods have replaced the App methods remove
the App methods.
Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
Joe Fernandez [Wed, 13 Feb 2013 23:23:20 +0000 (23:23 +0000)]
Merge "docs: SDK r21.1 - fix download links, Issue
8193979" into jb-mr1-dev
Kenny Root [Wed, 13 Feb 2013 23:22:50 +0000 (15:22 -0800)]
KeyChain: return null instead of throw
The API documentation says it will return null if the key isn't found.
We get null back from the keystore daemon when it can't retrieve the
data, so just return null back to the API caller.
Change-Id: I42248bd50cbc5f76864bd762aae3faab1c50529d
Craig Mautner [Wed, 13 Feb 2013 23:22:26 +0000 (23:22 +0000)]
Merge "Stop using AppToken movement and start using Task."
Kenny Root [Wed, 13 Feb 2013 23:22:25 +0000 (15:22 -0800)]
Track keystore binder changes
Change-Id: Id6133be059a8a0901d16355a9152e40e4a255454
OSDN Git Service
