Commit Graph

35898 Commits

Author SHA1 Message Date
Jerome Poichet
7974cb36ae Adding Activity Action entry
In L we're bringing the notion of a device name, which centralizes a
concept that has been used in different part of the system already
(bluetooth and WifiP2p among others)

The settings entry has already been created, but there is no centralized
UI for setting the name yet.

This CL would define the activity action that would have to be
implemented to set the device name.

b/14970370 - Global Device Name

Change-Id: I6876e4ca1ad887fdea1bc88890ddfad547145011
2014-05-14 15:50:46 -07:00
Jae Seo
3c659dea47 Merge "Add more columns to help identify TV channels" 2014-05-14 19:00:52 +00:00
Jerome Poichet
9e4f4040f3 Merge "Adding device name" 2014-05-14 18:57:14 +00:00
Craig Stout
162043076b Merge "AlertDialog and AppError themes for TV." 2014-05-14 16:19:51 +00:00
Robert Greenwalt
16fa43a28d Merge "Undeprecate funcs until we're ready for api-review" 2014-05-14 15:56:32 +00:00
Robert Greenwalt
7a91a7434a Undeprecate funcs until we're ready for api-review
Fixing javadoc deprecated tags to fix a checkbuild error breaks the current/api.txt.
We're not ready for the api change yet, so back out the comments.

Change-Id: Ia95e394da7329c1b9e3876e589c3c2137ba18048
2014-05-14 08:55:13 -07:00
Torne (Richard Coles)
93ffc21fc6 am 41ecc8b1: am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '41ecc8b1e04794f3d6db01b594cb6daaafd8ae1d':
  Avoid supported ABI list containing "unknown".
2014-05-14 15:40:39 +00:00
Torne (Richard Coles)
41ecc8b1e0 am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
  Avoid supported ABI list containing "unknown".
2014-05-14 15:35:19 +00:00
Torne (Richard Coles)
dcc9cf03a8 am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
  Avoid supported ABI list containing "unknown".
2014-05-14 15:31:28 +00:00
Torne (Richard Coles)
da8c037c8b Avoid supported ABI list containing "unknown".
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.

Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
2014-05-14 16:17:26 +01:00
Robert Greenwalt
8ac546eaa3 Fix Javadoc
It's Deprecated for an annotation, but deprecated for
a javadoc and case is important.

Fix build

Change-Id: I355dc1660196c09530b58386f401a85a74d16476
2014-05-14 07:50:11 -07:00
Robert Greenwalt
54b6fd0cbe Merge "Add networks and requests to CS.dump" 2014-05-14 13:44:26 +00:00
Robert Greenwalt
c9c90c771c Add networks and requests to CS.dump
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
2014-05-14 13:12:23 +00:00
Robert Greenwalt
9258c64bef Add Multinetwork API
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)
2014-05-14 13:06:56 +00:00
Paul Jensen
ca8f16ad14 Add NetworkMonitor.
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
2014-05-14 03:56:34 -07:00
Paul Jensen
992f252579 Separate network and interface addition/removal netd APIs.
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
2014-05-14 03:56:34 -07:00
Robert Greenwalt
7b81602f3c Enabling internal msg apis
NetworkFactory and NetworkAgent.  First trying with wifi and
getting rid of WifiStateTracker.

Conflicts:
	api/current.txt
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02
2014-05-14 03:56:34 -07:00
Sreeram Ramachandran
b2829fa165 Specify netId when adding/removing routes.
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
f047f2a8f4 Update netd API.
Remove:
- resetOldSockets from setDefaultNetId: netd takes care of this automatically.
- {add,remove}DnsServersForNetId: equivalent to "resolver setnetdns".

Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02
2014-05-14 03:56:33 -07:00
Paul Jensen
13e817df51 Use NetId instead of interface name when communicating DNS changes to netd.
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
2014-05-14 03:56:33 -07:00
Robert Greenwalt
913c895216 Update netd interface
Adding netId for route changes

bug:13732575
Change-Id: Id171412a0f580f71398c9b0b8742acb1f3ef5a1e
2014-05-14 03:56:32 -07:00
Robert Greenwalt
568891d928 Add multinetwork netd calls
bug:13732575
Change-Id: I7f030bd63971ff71d32a221e50318c781e7f2370
2014-05-14 03:56:32 -07:00
Yohei Yukawa
7ff49b3ad6 Merge "Use java.util.Objects" 2014-05-14 10:45:54 +00:00
Yohei Yukawa
c941fedf50 Use java.util.Objects
This is a follow up CL for I451544fba746a76618.

This CL replaces libcore.util.Objects with java.util.Objects as
java.util.Objects is getting more and more widely used in
Android. There should be no behavioural change anyway.

Change-Id: Id9568ee98aa3845588017c3711e7d03a3481beea
2014-05-14 19:38:07 +09:00
Adrian Roos
cd10d7c595 Merge "A better auto brightness" 2014-05-14 10:32:26 +00:00
Adrian Roos
daf7d410fc A better auto brightness
Bug: 14927472
Change-Id: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
2014-05-14 10:32:08 +00:00
Yohei Yukawa
d6f4e37554 Merge "Support IMM#updateCursorAnchorInfo in Editor" 2014-05-14 08:02:31 +00:00
Yohei Yukawa
83b68ba4ad Support IMM#updateCursorAnchorInfo in Editor
With this CL, Editor starts calling IMM#updateCursorAnchorInfo
iff IMM#isWatchingCursor(View) returns true. The performance
regression should be negligible when IMM#isWatchingCursor(View)
returns false.

BUG: 14579622
Change-Id: Ib35a6f4201b26d837a6aa07d1204c9eb75404da1
2014-05-14 16:22:53 +09:00
Robert Greenwalt
2491c3a0e8 Merge "Add Network-specific host name resolution API." 2014-05-14 05:39:10 +00:00
Chulwoo Lee
c3e00c3ffc Fix NPE while dispatching input event.
- occasionally, TvView can be detached while
  the input event is being processed.

BUG: 14791903
Change-Id: Id1def32ace1bf9765ae30a00ea4579670d1d40aa
2014-05-14 14:35:00 +09:00
Robert Greenwalt
e049c23980 Add NetworkFactory support.
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
2014-05-13 21:21:49 -07:00
Adam Powell
3288dbafe9 Merge "Tweak EdgeEffect" 2014-05-14 02:38:20 +00:00
Adam Powell
2897a6fded Tweak EdgeEffect
Make the effect less prominent/bulbous and not hit limits quite so
easily.

Change-Id: Ib8fdc29867276e6d0db447b60db0d7be3503d4d8
2014-05-13 19:05:53 -07:00
Craig Stout
4c0cb8a526 AlertDialog and AppError themes for TV.
Leanback themes override AlertDialog styles from other themes.
Makes system alert dialogs, and alert dialogs from games running on ATV,
have a style more appropriate to television.

Final visuals pending.

Side button layout fixes DatePickerDialog and TimePickerDialog with
dpad navigation.

TODO: consider using side button layout for other AlertDialog cases
(long messages and lists).

Change-Id: I74e4e04d16d6854377580be95a87684a0385b04b
2014-05-13 18:30:56 -07:00
Craig Mautner
7fd239cf0a Merge "Pass ActivityOptions back from finishing activity." 2014-05-14 00:54:41 +00:00
Youngsang Cho
a6a97905dc Merge "Fix NPE in TvInputService and TvView" 2014-05-14 00:39:28 +00:00
Igor Murashkin
fab0eadef2 Merge "camera2: Update native<->managed camera metadata marshalers" 2014-05-14 00:03:38 +00:00
Justin Koh
fc986d71ca resolved conflicts for merge of 32c5f299 to master
Change-Id: I72656792e109fea82c63a3a42151c024630f5997
2014-05-13 16:52:17 -07:00
George Mount
11d0415481 Merge "Check for null Drawable in MoveImage" 2014-05-13 23:31:09 +00:00
Justin Koh
32c5f2998f am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes.
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
  Set KITKAT_WATCH to be level 20, document API specific changes.
2014-05-13 23:24:33 +00:00
Paul Jensen
3e32a4b667 Add Network-specific host name resolution API.
Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
2014-05-13 19:05:13 -04:00
Justin Koh
78b94de4b5 Set KITKAT_WATCH to be level 20, document API specific changes.
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
2014-05-13 16:03:18 -07:00
Justin Koh
72a4c15c49 am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
  Hide new methods in notificationlistenerservice DO NOT MERGE
2014-05-13 22:45:50 +00:00
Igor Murashkin
3c40a046cf camera2: Update native<->managed camera metadata marshalers
* Improve existing marshalers:
 - each managed/native type combination can be queried marshal support
 - marshalers can recursively call other marshalers for nested types
 - support marshaling/unmarshaling generic classes by using super type tokens

* Add new marshalers for:
 - ColorSpaceTransform
 - MeteringRectangle
 - Parcelable
 - Range<T>
 - ReprocessFormatsMap
 - RggbChannelVector
 - SizeF
 - StreamConfiguration
 - StreamConfigurationDuration

Batteries included; so are unit tests.

Bug: 14628001
Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
2014-05-13 15:28:24 -07:00
Justin Koh
e98122ed5d Hide new methods in notificationlistenerservice DO NOT MERGE
Hide new methods in notificationlistenerservice for now.
Bug: 14116162

Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
2014-05-13 15:10:16 -07:00
John Reck
191437447a Merge "Wire up texture atlas" 2014-05-13 21:59:31 +00:00
John Reck
66f0be65a1 Wire up texture atlas
Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
2014-05-13 14:54:42 -07:00
Aaron Whyte
8f8c7f413f am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:41:38 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:36:31 +00:00
George Mount
d8d99984c5 Merge "Add view name to Transition matching." 2014-05-13 20:08:20 +00:00