Lorenzo Colitti
7dc78cf3af
Minor changes to the LinkAddress API docs.
...
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
callers in frameworks/base and add a shim method and a TODO
for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
been </ul>).
4. Remove the documentation that talks about creating
LinkAddresses, since there's no public API for creating them.
With these changes I think LinkAddress is fine as a public API.
Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -07:00
Sreeram Ramachandran
cc91c7b804
Add a new IpPrefix class and use it in RouteInfo.
...
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.
Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.
Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
destradaa
54f6e80d32
Merge "IPv6 support for GPS HAL."
2014-06-10 19:42:04 +00:00
Raph Levien
cc8f7ae682
Merge "Support fake italics"
2014-06-10 19:05:29 +00:00
Raph Levien
a7be5dd006
Merge "Support for fake bold in Minikin builds"
2014-06-10 19:05:20 +00:00
Raph Levien
0627ec08dc
Support fake italics
...
This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.
Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
2014-06-10 11:49:44 -07:00
Amit Mahajan
965bba3434
Merge "resolved conflicts for merge of 437a77d4 to master"
2014-06-10 18:38:26 +00:00
Raph Levien
1fc0fa87d4
Support for fake bold in Minikin builds
...
Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)
This patch queries the Minikin layout for when fake bold is needed,
and applies that to both shaping and drawing paint.
Also simplifies refcounting (the lifetime of all MinikinFont objects
is subsumed by the enclosing FontCollection).
Note: the fake bold flag set by the user is ignored in this patch.
Fake italics would be possible using the same mechanism, but it's
slightly more complicated (fake and user-set textSkewX values would need
to be combined, and the latter restored after drawing).
Change-Id: Ica2c4604846cbb37e5a783778b18d8993c9d4563
2014-06-10 11:37:55 -07:00
destradaa
96a14701c0
IPv6 support for GPS HAL.
...
Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
2014-06-10 11:14:31 -07:00
Leon Scroggins III
cdb4a446de
Merge "Fix a memory leak with empty screenshot."
2014-06-10 18:08:45 +00:00
Matthew Williams
7b5c2340ad
am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
...
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
Remove SyncRequest.setPriority from public API
2014-06-10 18:05:41 +00:00
Baligh Uddin
ad423df32e
am fada3c25: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit 'fada3c25b3e9e7e58b14b42d676220a78264d1d9':
Import translations. DO NOT MERGE
2014-06-10 18:05:36 +00:00
Santos Cordon
2489ac9d24
am 6538ac8c: (-s ours) Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
...
* commit '6538ac8c012a67215ee98208f5a668eeb5b7c483':
Support conference calling. (1/4) [DO NOT MERGE]
2014-06-10 18:05:30 +00:00
Baligh Uddin
ecdb5b2bf8
am 66703cb3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit '66703cb306e154a68bd3ec6b7f15585e7db6b815':
Import translations. DO NOT MERGE
2014-06-10 18:05:23 +00:00
Baligh Uddin
ab82c3b4a9
am eaeb602c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit 'eaeb602cc207b7d56c829d63cb0d951d28650cbd':
Import translations. DO NOT MERGE
2014-06-10 18:05:18 +00:00
Adam Connors
39f1311ce1
am 2e98c52d: (-s ours) DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
...
* commit '2e98c52d0b2f4722a237933c69f3ba38314479f4':
DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
2014-06-10 18:05:07 +00:00
Adam Connors
9d4f771ac1
am c8d4c310: (-s ours) DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
...
* commit 'c8d4c3109a946fe3d4cf48ec7b14950b37abd669':
DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
2014-06-10 18:05:01 +00:00
Amit Mahajan
0409e9f0af
resolved conflicts for merge of 437a77d4 to master
...
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
2014-06-10 10:47:26 -07:00
Chris Craik
1e5cf9aced
am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev
...
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
Tessellate on worker threads
2014-06-10 17:22:31 +00:00
Igor Murashkin
f1d758867a
am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
...
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
Adam Lesinski
859cd926fe
am a277deb7: (-s ours) DO NOT MERGE - Creating an empty package should be succesfull
...
* commit 'a277deb755f95ca42e39f8910d958bfd1ceafa55':
DO NOT MERGE - Creating an empty package should be succesfull
2014-06-10 17:22:12 +00:00
Jeff Brown
085a1e7933
am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission.
...
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
@hide ACCESS_INPUT_FLINGER permission.
2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c
am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
...
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b
am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev
...
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
Switch framework to using new scheduled-work API
2014-06-10 17:21:47 +00:00
Fabrice Di Meglio
5ef6f9078a
am 821c8331: Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev
...
* commit '821c833143d396cf64536eb4938c0d79d1adccc6':
Fix bug #14258811 Permissions icons are not visible in App info
2014-06-10 17:21:42 +00:00
Leon Scroggins III
e3f9800f38
Fix a memory leak with empty screenshot.
...
Use an autodeleter to delete the ScreenshotClient when it's not
needed.
Discovered while investigating BUG:15454296, but it does not fix
the problem.
Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
2014-06-10 13:19:35 -04:00
Matthew Williams
c2c1a39510
Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
2014-06-10 15:50:11 +00:00
Adrian Roos
178e2b98c1
Merge "Add Emergency Calls Only and Charging State to Status Bar Header"
2014-06-10 15:41:15 +00:00
Baligh Uddin
6af88cc76f
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:37:56 +00:00
Baligh Uddin
2ad173d891
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:37:54 +00:00
Santos Cordon
ece0270d99
Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
2014-06-10 15:34:30 +00:00
Baligh Uddin
342c0d0a94
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:29:10 +00:00
Baligh Uddin
c60aa41104
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:30 +00:00
Baligh Uddin
6584375afd
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:28:25 +00:00
Baligh Uddin
5f4291c1a5
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:25 +00:00
Baligh Uddin
56f7c59168
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:25 +00:00
Baligh Uddin
291258c880
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:19 +00:00
Matthew Williams
f53c295ae3
am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
...
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
Add OnNetworkActive to TaskManager and simplify locking.
2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29
resolved conflicts for merge of 2d2aa0cc to master
...
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Adrian Roos
59a6127551
Add Emergency Calls Only and Charging State to Status Bar Header
...
Bug: 15393101
Change-Id: If1dc300d843fb5f694ef57714225f43924dbb2b8
2014-06-10 14:49:10 +02:00
Adam Connors
8f70744221
DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
...
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.
Bug: 14400206
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
(cherry picked from commit c11c67b3e117b4fec3245f87b6d510461c1f8323)
2014-06-10 11:39:31 +00:00
Jeff Sharkey
d734c698e3
am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev
...
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
Refactor directory API to "opening document tree."
2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28
am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev
...
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-10 11:18:48 +00:00
Alan Viverette
3b77eb33a5
am 28104981: Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev
...
* commit '28104981ea36e96e0c85b735b91583fb344b85c5':
Optimize use of layers in ripple, update dialog styling
2014-06-10 11:18:38 +00:00
Alan Viverette
4a00c53800
am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev
...
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
Use a weak reference to the ObjectAnimator target
2014-06-10 11:18:30 +00:00
Jeff Brown
11ef6a3b11
am 16eb7133: (-s ours) Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
...
* commit '16eb71335edcbe2978e2b2a9e5a69d1458ab03bd':
Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
2014-06-10 11:18:19 +00:00
Jeff Brown
260fd18d4d
am 1337bac1: (-s ours) Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
...
* commit '1337bac111c70ba4ccce21b2c75491ee690954a8':
Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
2014-06-10 11:18:14 +00:00
Jeff Brown
1ffcc58c68
am 7296e808: (-s ours) Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
...
* commit '7296e80837cd8e406e04193c239a1441c9f147b0':
Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
2014-06-10 11:18:09 +00:00
Michael Wright
66a862c38e
am b225171e: (-s ours) Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev
...
* commit 'b225171eb981dbd062c6c6b42a963930a31a2a51':
Pack PointerCoords with BitSet. DO NOT MERGE
2014-06-10 11:18:02 +00:00
Matthew Williams
3f51a909f0
am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev
...
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
Add test app for JobScheduler
2014-06-10 11:17:55 +00:00