OSDN Git Service
Baligh Uddin [Tue, 29 Apr 2014 21:07:16 +0000 (21:07 +0000)]
am
c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c2e5503dbae833065a16fe35296e202db3887920':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Apr 2014 21:02:59 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Selim Gurun [Tue, 29 Apr 2014 18:49:24 +0000 (18:49 +0000)]
am
c23f5651: (-s ours) am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
c23f5651fd40eca1b751376c369fd9f3c9deb64e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:45:53 +0000 (18:45 +0000)]
am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add invokeFunctor stub"
Bo Liu [Tue, 29 Apr 2014 18:38:37 +0000 (11:38 -0700)]
DO NOT MERGE Add invokeFunctor stub
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
Elliott Hughes [Tue, 29 Apr 2014 04:05:25 +0000 (04:05 +0000)]
am
7af8f5ba: am
10d57c4b: Merge "Fix two zygote imports."
* commit '
7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 04:01:25 +0000 (04:01 +0000)]
am
cf939672: am
2e9d924d: Merge "Remove unused import."
* commit '
cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 04:01:01 +0000 (04:01 +0000)]
am
10d57c4b: Merge "Fix two zygote imports."
* commit '
10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 03:56:19 +0000 (03:56 +0000)]
am
2e9d924d: Merge "Remove unused import."
* commit '
2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 03:54:49 +0000 (03:54 +0000)]
Merge "Fix two zygote imports."
Elliott Hughes [Tue, 29 Apr 2014 03:53:52 +0000 (20:53 -0700)]
Fix two zygote imports.
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
Elliott Hughes [Tue, 29 Apr 2014 03:52:10 +0000 (03:52 +0000)]
Merge "Remove unused import."
Elliott Hughes [Tue, 29 Apr 2014 03:51:34 +0000 (20:51 -0700)]
Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
Elliott Hughes [Tue, 29 Apr 2014 02:34:37 +0000 (02:34 +0000)]
am
fff28619: am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:31:34 +0000 (02:31 +0000)]
am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
f4a7ac00a734343b8d2760def352cbdf99fa08c7':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:28:06 +0000 (02:28 +0000)]
Merge "Move the Zygote off libcore.os and onto android.system."
Elliott Hughes [Tue, 29 Apr 2014 02:19:13 +0000 (19:19 -0700)]
Move the Zygote off libcore.os and onto android.system.
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
Yuling Liang [Mon, 28 Apr 2014 23:18:58 +0000 (23:18 +0000)]
am
26a5c2dd: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
26a5c2dd740f309f3168790fc55a164738963835':
Followon fix for
14276128 Clipping at bottom of TextView
Yuling Liang [Mon, 28 Apr 2014 23:16:12 +0000 (23:16 +0000)]
Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
David Friedman [Mon, 28 Apr 2014 23:07:40 +0000 (23:07 +0000)]
am
0c18705b: am
3fef8e60: am
1053b2c5: Merge "Fixed missing line break, broken link. Bug:
13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs
* commit '
0c18705bf10e1e04fbb2b2afaf5f9537764148a5':
Fixed missing line break, broken link. Bug:
13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
David Friedman [Mon, 28 Apr 2014 23:03:25 +0000 (23:03 +0000)]
am
3fef8e60: am
1053b2c5: Merge "Fixed missing line break, broken link. Bug:
13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs
* commit '
3fef8e60668bb955763367ac17c1195e46b3078c':
Fixed missing line break, broken link. Bug:
13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
David Friedman [Mon, 28 Apr 2014 21:56:07 +0000 (21:56 +0000)]
am
1053b2c5: Merge "Fixed missing line break, broken link. Bug:
13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs
* commit '
1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
Fixed missing line break, broken link. Bug:
13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
David Friedman [Mon, 28 Apr 2014 21:52:45 +0000 (21:52 +0000)]
Merge "Fixed missing line break, broken link. Bug:
13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs
Griff Hazen [Mon, 28 Apr 2014 20:37:24 +0000 (20:37 +0000)]
am
3c5a6cf9: am
2c6131bb: am
293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '
3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
Griff Hazen [Mon, 28 Apr 2014 20:33:22 +0000 (20:33 +0000)]
am
2c6131bb: am
293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '
2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
Adam Lesinski [Mon, 28 Apr 2014 20:33:09 +0000 (20:33 +0000)]
am
8ea2d451: Merge "Various CTS fixes" into klp-modular-dev
* commit '
8ea2d4512248ec612356f558ac35534c3e4c6db6':
Various CTS fixes
Adam Lesinski [Mon, 28 Apr 2014 20:30:35 +0000 (20:30 +0000)]
Merge "Various CTS fixes" into klp-modular-dev
Griff Hazen [Mon, 28 Apr 2014 20:29:12 +0000 (20:29 +0000)]
am
293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '
293977bdb028e2aa893fbeb370e20132646094a9':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
Elliott Hughes [Mon, 28 Apr 2014 19:48:24 +0000 (19:48 +0000)]
Elliott Hughes [Mon, 28 Apr 2014 19:45:06 +0000 (19:45 +0000)]
Elliott Hughes [Mon, 28 Apr 2014 19:41:24 +0000 (19:41 +0000)]
Merge "Fix build."
Elliott Hughes [Mon, 28 Apr 2014 19:40:12 +0000 (12:40 -0700)]
Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
Elliott Hughes [Mon, 28 Apr 2014 18:36:53 +0000 (18:36 +0000)]
am
685a0a72: am
bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '
685a0a72d445515167a2071330679cdf9b53a62d':
Track libcore.os' move to android.system.
Mathieu Chartier [Mon, 28 Apr 2014 18:36:44 +0000 (18:36 +0000)]
am
18582a82: am
0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '
18582a827c3f908cd75e1d9c189c554f42415a4a':
Use Runtime.gc instead of System.gc for DDMS.
Elliott Hughes [Mon, 28 Apr 2014 18:17:06 +0000 (18:17 +0000)]
am
bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '
bbd87eb9193e9730869171324ee4f5fc1abeae55':
Track libcore.os' move to android.system.
Elliott Hughes [Mon, 28 Apr 2014 18:13:59 +0000 (18:13 +0000)]
Merge "Track libcore.os' move to android.system."
Mathieu Chartier [Mon, 28 Apr 2014 18:13:07 +0000 (18:13 +0000)]
am
0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '
0cd623bb9f832194cdd9c08625fa32583e947c76':
Use Runtime.gc instead of System.gc for DDMS.
Elliott Hughes [Mon, 28 Apr 2014 18:11:32 +0000 (11:11 -0700)]
Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
Mathieu Chartier [Mon, 28 Apr 2014 18:10:41 +0000 (18:10 +0000)]
Merge "Use Runtime.gc instead of System.gc for DDMS."
Mathieu Chartier [Mon, 28 Apr 2014 17:16:17 +0000 (10:16 -0700)]
Use Runtime.gc instead of System.gc for DDMS.
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.
Bug:
14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]
Followon fix for
14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.
So this should be the proper fix for bug
14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1
This version of the patch also handles the single-line case (which is
computed in BoringLayout rather than StaticLayout).
Change-Id: I88791acc2aa493cc8c599b374f4d213571260b4b
Griff Hazen [Mon, 28 Apr 2014 15:37:20 +0000 (08:37 -0700)]
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
The logic was opposite.
Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
Baligh Uddin [Mon, 28 Apr 2014 16:53:10 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f
Auto-generated-cl: translation import
Wink Saville [Sat, 26 Apr 2014 00:25:44 +0000 (00:25 +0000)]
am
1c1827a6: am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Sat, 26 Apr 2014 00:20:02 +0000 (00:20 +0000)]
am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
3f4867f49d6c1932117e3519ce10d11f37829f19':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Fri, 25 Apr 2014 23:58:11 +0000 (23:58 +0000)]
Merge "Telephony: Add functionality to handle ICC IO error"
Vince Harron [Fri, 25 Apr 2014 23:25:11 +0000 (23:25 +0000)]
am
4f50911a: am
e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that
* commit '
4f50911aa18f9d4650c6721456dd05ac499fcefd':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Vince Harron [Fri, 25 Apr 2014 23:22:07 +0000 (23:22 +0000)]
am
e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat
* commit '
e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Vince Harron [Fri, 25 Apr 2014 23:17:36 +0000 (23:17 +0000)]
Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev
Ricardo Cervera [Fri, 25 Apr 2014 22:37:45 +0000 (22:37 +0000)]
am
6fe328c6: am
86afa0b5: am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
6fe328c62abd3b98aceeeb99aaf5d824bd42adc6':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:33:25 +0000 (22:33 +0000)]
am
86afa0b5: am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:21:10 +0000 (22:21 +0000)]
am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
039bd50825f7ea8b706c8ea6e54a1c893759309d':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:15:28 +0000 (22:15 +0000)]
Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
Mark Salyzyn [Fri, 25 Apr 2014 22:07:07 +0000 (22:07 +0000)]
am
dfdeabf9: am
ac732708: Merge "EventLog: event log translation errors"
* commit '
dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 22:03:20 +0000 (22:03 +0000)]
am
ac732708: Merge "EventLog: event log translation errors"
* commit '
ac7327082c411617f7937b87575c117bd63ad9df':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 21:59:18 +0000 (21:59 +0000)]
Merge "EventLog: event log translation errors"
David Friedman [Fri, 25 Apr 2014 21:00:28 +0000 (14:00 -0700)]
Fixed missing line break, broken link.
Bug:
13975265
Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
Change-Id: I69f7e56f9b261c776672161cfb1649c4cd72c96e
Mark Salyzyn [Fri, 25 Apr 2014 20:25:18 +0000 (13:25 -0700)]
EventLog: event log translation errors
- Deal with L using v3 event log format, or K using v1 or v2 event log format
Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
Craig Mautner [Fri, 25 Apr 2014 18:45:06 +0000 (18:45 +0000)]
am
1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '
1a7e9e66a6de039da8f567a2087d9bce34820746':
Throw exception from startActivity if not allowed.
Craig Mautner [Fri, 25 Apr 2014 18:39:46 +0000 (18:39 +0000)]
Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 17:09:00 +0000 (10:09 -0700)]
Throw exception from startActivity if not allowed.
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.
This fix checks the attribute at the time ActivityView.startActivity
is called.
Fixes bug
14317210.
Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
Adam Lesinski [Wed, 23 Apr 2014 20:46:21 +0000 (13:46 -0700)]
Various CTS fixes
WallpaperManager should always do a null check on the service object.
SystemServer should always bring up the DevicePolicyManagerService,
and let the service do appropriate default no-ops if the feature
is not supported.
Change-Id: Iaaf12b60ed375fe2e341ec11faa10c9344d7d9da
Yuling Liang [Fri, 25 Apr 2014 17:35:52 +0000 (17:35 +0000)]
am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
eea94f060a917a5c6195a81d8825551a430a8d69':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:32:28 +0000 (17:32 +0000)]
Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
Yuling Liang [Fri, 25 Apr 2014 17:32:08 +0000 (17:32 +0000)]
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
This reverts commit
a10e19845ce76c0e4dd38018c84b83c9255dc9fe.
Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
Yuling Liang [Fri, 25 Apr 2014 16:34:15 +0000 (16:34 +0000)]
am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
243e551ac380f86639eee3e95a482d8e17836670':
Followon fix for
14276128 Clipping at bottom of TextView
Yuling Liang [Fri, 25 Apr 2014 16:30:12 +0000 (16:30 +0000)]
Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
Marco Nelissen [Fri, 25 Apr 2014 14:52:18 +0000 (14:52 +0000)]
am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
eded9e3b7f6f30526365461a25624b841611af28':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Craig Mautner [Fri, 25 Apr 2014 03:06:34 +0000 (03:06 +0000)]
am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
3a656ea32e6d6489f4bc45884e5acede9fe2de51':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]
Merge "Too soon." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]
Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
Selim Gurun [Fri, 25 Apr 2014 01:15:36 +0000 (01:15 +0000)]
am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
8c2d70f5e8dfe64213f44c29562fe4240779b68b':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:47:23 +0000 (00:47 +0000)]
am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
f7a191731f6c840eed9283652648f267589502c2':
Add a stub to fix master-gpl
Craig Mautner [Fri, 25 Apr 2014 00:42:25 +0000 (00:42 +0000)]
am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
3359bbe02ca645bae2f495df51e7b4001de6c2b1':
Add test for attribute android:allowEmbedded
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Elliott Hughes [Thu, 24 Apr 2014 23:59:05 +0000 (23:59 +0000)]
am
5f5ca3bc: am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Andrew Solovay [Thu, 24 Apr 2014 23:45:09 +0000 (23:45 +0000)]
am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
3cb4430b071e9e978853f73c0cccd15dc2f37a49':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:41:26 +0000 (23:41 +0000)]
am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
27547e6d3a22fb9615594769e460c6a86f2dd44b':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:37:40 +0000 (23:37 +0000)]
am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
Correcting name of 'Backup & reset' menu.
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Andrew Solovay [Thu, 24 Apr 2014 22:47:38 +0000 (15:47 -0700)]
Correcting name of 'Backup & reset' menu.
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing
Bug:
14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
Mark Salyzyn [Thu, 24 Apr 2014 22:17:11 +0000 (22:17 +0000)]
am
eacaa353: am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
eacaa353e83942d3c59d0db594df0fb6179e0eea':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:14:02 +0000 (22:14 +0000)]
am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]
Followon fix for
14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.
So this should be the proper fix for bug
14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1
Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
Nick Kralevich [Thu, 24 Apr 2014 18:25:58 +0000 (18:25 +0000)]
am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"