OSDN Git Service
Evan Charlton [Wed, 14 May 2014 22:07:47 +0000 (22:07 +0000)]
Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
Jinsuk Kim [Wed, 14 May 2014 22:02:05 +0000 (22:02 +0000)]
Merge "Add a new resource for HDMI-CEC logical device type definition"
Dirk Dougherty [Wed, 14 May 2014 21:54:27 +0000 (21:54 +0000)]
am
ae4388f7: am
0f582284: am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
ae4388f794d3ba4087f65b528eba06d5015c9c9a':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:52:28 +0000 (21:52 +0000)]
Merge "resolved conflices for merge of
93ccd1a2 to master"
Dirk Dougherty [Wed, 14 May 2014 21:47:28 +0000 (14:47 -0700)]
resolved conflices for merge of
93ccd1a2 to master
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
Sreeram Ramachandran [Wed, 14 May 2014 21:48:26 +0000 (21:48 +0000)]
Merge "Fix reboot loop due to NPE."
David Christie [Wed, 14 May 2014 21:45:44 +0000 (21:45 +0000)]
Merge "Fix typo in comment"
Sreeram Ramachandran [Wed, 14 May 2014 21:45:00 +0000 (14:45 -0700)]
Fix reboot loop due to NPE.
All that's old is new again: http://ag/63748.
Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
Andrew Lee [Wed, 14 May 2014 21:44:38 +0000 (21:44 +0000)]
Merge "Handle normalization of a "null" phone number."
David Christie [Wed, 14 May 2014 21:28:54 +0000 (14:28 -0700)]
Fix typo in comment
Change-Id: I880385f250d95ad9eea1c39bdf126797177e00a1
Dirk Dougherty [Wed, 14 May 2014 21:24:29 +0000 (21:24 +0000)]
am
0f582284: am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:24:24 +0000 (21:24 +0000)]
am
0540bc37: am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:21:23 +0000 (21:21 +0000)]
am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:21:15 +0000 (21:21 +0000)]
am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:17:27 +0000 (21:17 +0000)]
am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:17:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:16:31 +0000 (21:16 +0000)]
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
Evan Charlton [Wed, 14 May 2014 21:01:47 +0000 (14:01 -0700)]
Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."
This reverts commit
37384dedab38239433a41641fe87fc3e51bb6976.
Adam Lesinski [Wed, 14 May 2014 20:30:09 +0000 (20:30 +0000)]
Merge "Fix potential crash in libandroidfw"
Ed Heyl [Wed, 14 May 2014 20:24:53 +0000 (13:24 -0700)]
merge master nova by hand, skipped translations
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
Andrew Lee [Wed, 14 May 2014 19:13:02 +0000 (12:13 -0700)]
Handle normalization of a "null" phone number.
Bug:
14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
Michael Wright [Wed, 14 May 2014 19:50:48 +0000 (19:50 +0000)]
Merge "Remove reflection from InputEventConsistencyVerifier ctor."
Michael Wright [Wed, 14 May 2014 19:43:15 +0000 (19:43 +0000)]
Merge "Only translate prefixed strings to keys / axes."
Chris Wren [Wed, 14 May 2014 19:30:12 +0000 (19:30 +0000)]
Merge "Add intrusiveness signal extractor."
Adrian Roos [Wed, 14 May 2014 19:02:17 +0000 (19:02 +0000)]
Merge "Fix adaptive auto brightness bugs"
Jae Seo [Wed, 14 May 2014 19:00:51 +0000 (19:00 +0000)]
Merge "Add more columns to help identify TV channels"
Jerome Poichet [Wed, 14 May 2014 18:57:14 +0000 (18:57 +0000)]
Merge "Adding device name"
Adam Lesinski [Wed, 14 May 2014 18:43:26 +0000 (11:43 -0700)]
Fix potential crash in libandroidfw
A malformed APK may cause a crash if it
encodes its chunk size as a signed number
(MSB set to 1).
Bug:
14898892
Change-Id: I342853c2b0859e5be15d712d451323afc367d329
Adrian Roos [Wed, 14 May 2014 18:30:00 +0000 (18:30 +0000)]
Merge "Follow up for "A better auto brightness""
Chris Wren [Thu, 8 May 2014 14:42:09 +0000 (10:42 -0400)]
Add intrusiveness signal extractor.
Temporarily bump noisy things to the top so the user can find them.
This is the first example of a delayed ranking reconsideration.
Change-Id: I07271ba197101ad462e4f99fb7c369a39c8c2e2f
Adrian Roos [Wed, 14 May 2014 18:01:43 +0000 (20:01 +0200)]
Follow up for "A better auto brightness"
Original CL: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
Change-Id: I79c307586c0ba9be275d3920a3805f45b6006ce8
Adrian Roos [Wed, 14 May 2014 17:44:18 +0000 (19:44 +0200)]
Fix adaptive auto brightness bugs
Fix update of the light sensor in AutoBrightnessController.
Register observer for Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ.
Change-Id: I5201259c4efc0afa200fea3ad9fe3af2991d8676
John Spurlock [Wed, 14 May 2014 17:34:02 +0000 (17:34 +0000)]
Merge "Add QS rotation tile toggle animation."
John Spurlock [Wed, 14 May 2014 17:32:14 +0000 (13:32 -0400)]
Add QS rotation tile toggle animation.
Change-Id: Ic7e6e36759ef17ab35d639d22bbd2f6bf2470272
Craig Stout [Wed, 14 May 2014 16:19:51 +0000 (16:19 +0000)]
Merge "AlertDialog and AppError themes for TV."
Robert Greenwalt [Wed, 14 May 2014 15:56:31 +0000 (15:56 +0000)]
Merge "Undeprecate funcs until we're ready for api-review"
Robert Greenwalt [Wed, 14 May 2014 15:45:02 +0000 (08:45 -0700)]
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
Torne (Richard Coles) [Wed, 14 May 2014 15:40:39 +0000 (15:40 +0000)]
am
41ecc8b1: am
dcc9cf03: am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
41ecc8b1e04794f3d6db01b594cb6daaafd8ae1d':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:35:19 +0000 (15:35 +0000)]
am
dcc9cf03: am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:31:28 +0000 (15:31 +0000)]
am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
Adrian Roos [Wed, 14 May 2014 15:28:09 +0000 (15:28 +0000)]
Merge "Fix visibility and add bouncer event in KeyguardUpdateMonitor"
Torne (Richard Coles) [Wed, 14 May 2014 15:26:04 +0000 (15:26 +0000)]
Merge "Avoid supported ABI list containing "unknown"."
John Spurlock [Wed, 14 May 2014 15:20:17 +0000 (15:20 +0000)]
Merge "Update QS bugreport icon."
John Spurlock [Wed, 14 May 2014 15:18:39 +0000 (11:18 -0400)]
Update QS bugreport icon.
Change-Id: I24b2f7b88650e272bf1ab6409656164094382621
Torne (Richard Coles) [Wed, 14 May 2014 15:17:26 +0000 (16:17 +0100)]
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
Adrian Roos [Wed, 14 May 2014 13:52:53 +0000 (15:52 +0200)]
Fix visibility and add bouncer event in KeyguardUpdateMonitor
Bug:
14087751
Change-Id: I45bc2213dfcce751180762d18ead0382f68cac74
Robert Greenwalt [Wed, 14 May 2014 14:50:11 +0000 (07:50 -0700)]
Fix Javadoc
It's Deprecated for an annotation, but deprecated for
a javadoc and case is important.
Fix build
Change-Id: I355dc1660196c09530b58386f401a85a74d16476
Robert Greenwalt [Wed, 14 May 2014 13:44:26 +0000 (13:44 +0000)]
Merge "Add networks and requests to CS.dump"
Robert Greenwalt [Tue, 13 May 2014 22:36:27 +0000 (15:36 -0700)]
Add networks and requests to CS.dump
Adds debugging.
Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit
9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
Robert Greenwalt [Wed, 26 Mar 2014 23:47:06 +0000 (16:47 -0700)]
Add Multinetwork API
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit
cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)
Lorenzo Colitti [Wed, 14 May 2014 12:48:45 +0000 (12:48 +0000)]
Merge "Handle legacy synchronous inspectors"
Lorenzo Colitti [Wed, 14 May 2014 12:48:24 +0000 (12:48 +0000)]
Merge "Get clatd/Nat464Xlat working with new NetworkAgents."
Lorenzo Colitti [Wed, 14 May 2014 12:48:07 +0000 (12:48 +0000)]
Merge "Fix compile errors after merge."
Lorenzo Colitti [Wed, 14 May 2014 12:47:45 +0000 (12:47 +0000)]
Merge "Disable calls to MobileDataStateTracker.isProvisioning() as there is no more MobileDataStateTracker so these just crash."
Lorenzo Colitti [Wed, 14 May 2014 12:47:22 +0000 (12:47 +0000)]
Merge "Add NetworkMonitor. At present the network evaluation / captive portal detection is disabled pending addition of API to bind socket to network."
Lorenzo Colitti [Wed, 14 May 2014 12:47:01 +0000 (12:47 +0000)]
Merge "Separate network and interface addition/removal netd APIs. This should facilitate stacked interfaces (i.e. clatd)."
Lorenzo Colitti [Wed, 14 May 2014 12:46:27 +0000 (12:46 +0000)]
Merge "Enabling internal msg apis"
Lorenzo Colitti [Wed, 14 May 2014 12:46:03 +0000 (12:46 +0000)]
Merge "Fix build."
Lorenzo Colitti [Wed, 14 May 2014 12:45:38 +0000 (12:45 +0000)]
Merge "Specify netId when adding/removing routes."
Lorenzo Colitti [Wed, 14 May 2014 12:45:18 +0000 (12:45 +0000)]
Merge "Set and clear the default network."
Lorenzo Colitti [Wed, 14 May 2014 12:44:55 +0000 (12:44 +0000)]
Merge "Update netd API."
Lorenzo Colitti [Wed, 14 May 2014 12:44:40 +0000 (12:44 +0000)]
Merge "Get ConnectivityServiceTest building again after
8f80cc8."
Lorenzo Colitti [Wed, 14 May 2014 12:44:19 +0000 (12:44 +0000)]
Merge "Use NetId instead of interface name when communicating DNS changes to netd."
Lorenzo Colitti [Wed, 14 May 2014 12:43:57 +0000 (12:43 +0000)]
Merge "Update the API for permission set/clear."
Lorenzo Colitti [Wed, 14 May 2014 12:43:44 +0000 (12:43 +0000)]
Merge "Update netd interface"
Lorenzo Colitti [Wed, 14 May 2014 12:43:27 +0000 (12:43 +0000)]
Merge "Add multinetwork netd calls"
Lorenzo Colitti [Wed, 14 May 2014 12:43:19 +0000 (12:43 +0000)]
Merge "Stop adding host routes for dns"
Jorim Jaggi [Wed, 14 May 2014 12:35:45 +0000 (12:35 +0000)]
Merge "Handle media key events correctly on Keyguard."
Jorim Jaggi [Tue, 13 May 2014 21:06:35 +0000 (23:06 +0200)]
Handle media key events correctly on Keyguard.
Bug:
14490267
Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
Jorim Jaggi [Wed, 14 May 2014 12:28:13 +0000 (12:28 +0000)]
Merge "Fix Keyboard over Keyguard when password is set."
Jorim Jaggi [Tue, 13 May 2014 20:50:20 +0000 (22:50 +0200)]
Fix Keyboard over Keyguard when password is set.
Bug:
14842750
Change-Id: Ie7d92ee60191f8083c8ff65aba3754c71e4a5819
Alexandra Gherghina [Wed, 14 May 2014 11:59:44 +0000 (11:59 +0000)]
Merge "Ensure only enabled profile apps can be launched"
Alexandra Gherghina [Tue, 6 May 2014 16:09:33 +0000 (17:09 +0100)]
Ensure only enabled profile apps can be launched
Change-Id: I396e99eb6b8a957d994962300eeffeec61d7c46a
Bug:
13691041
Robert Greenwalt [Wed, 14 May 2014 04:41:06 +0000 (21:41 -0700)]
Handle legacy synchronous inspectors
getNetworkInfo, getActiveNetworkInfo, etc
Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c
Paul Jensen [Tue, 13 May 2014 15:44:01 +0000 (11:44 -0400)]
Get clatd/Nat464Xlat working with new NetworkAgents.
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92
Lorenzo Colitti [Wed, 14 May 2014 08:42:29 +0000 (01:42 -0700)]
Fix compile errors after merge.
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.
Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
Paul Jensen [Mon, 12 May 2014 21:39:09 +0000 (17:39 -0400)]
Disable calls to MobileDataStateTracker.isProvisioning() as there is no more
MobileDataStateTracker so these just crash.
Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d
Paul Jensen [Fri, 9 May 2014 16:47:55 +0000 (12:47 -0400)]
Add NetworkMonitor.
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.
Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
Paul Jensen [Mon, 28 Apr 2014 14:33:11 +0000 (10:33 -0400)]
Separate network and interface addition/removal netd APIs.
This should facilitate stacked interfaces (i.e. clatd).
Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
Robert Greenwalt [Fri, 18 Apr 2014 22:25:25 +0000 (15:25 -0700)]
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
Sreeram Ramachandran [Wed, 16 Apr 2014 17:56:07 +0000 (10:56 -0700)]
Fix build.
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
Sreeram Ramachandran [Wed, 16 Apr 2014 02:07:12 +0000 (19:07 -0700)]
Specify netId when adding/removing routes.
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
Sreeram Ramachandran [Tue, 15 Apr 2014 23:35:19 +0000 (16:35 -0700)]
Set and clear the default network.
Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0
Sreeram Ramachandran [Tue, 15 Apr 2014 23:04:26 +0000 (16:04 -0700)]
Update netd API.
Remove:
- resetOldSockets from setDefaultNetId: netd takes care of this automatically.
- {add,remove}DnsServersForNetId: equivalent to "resolver setnetdns".
Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02
Paul Jensen [Tue, 15 Apr 2014 19:48:48 +0000 (15:48 -0400)]
Get ConnectivityServiceTest building again after
8f80cc8.
Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671
Paul Jensen [Thu, 10 Apr 2014 18:16:37 +0000 (14:16 -0400)]
Use NetId instead of interface name when communicating DNS changes to netd.
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
Sreeram Ramachandran [Thu, 10 Apr 2014 22:58:39 +0000 (15:58 -0700)]
Update the API for permission set/clear.
Change-Id: I1d10a5702a77cb24fa52016bb497d52270379f8a
Robert Greenwalt [Tue, 8 Apr 2014 00:36:35 +0000 (17:36 -0700)]
Update netd interface
Adding netId for route changes
bug:
13732575
Change-Id: Id171412a0f580f71398c9b0b8742acb1f3ef5a1e
Robert Greenwalt [Fri, 4 Apr 2014 20:38:00 +0000 (13:38 -0700)]
Add multinetwork netd calls
bug:
13732575
Change-Id: I7f030bd63971ff71d32a221e50318c781e7f2370
Robert Greenwalt [Mon, 31 Mar 2014 17:43:43 +0000 (10:43 -0700)]
Stop adding host routes for dns
bug:
13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
Yohei Yukawa [Wed, 14 May 2014 10:45:54 +0000 (10:45 +0000)]
Merge "Use java.util.Objects"
Yohei Yukawa [Wed, 14 May 2014 10:33:35 +0000 (19:33 +0900)]
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
Adrian Roos [Wed, 14 May 2014 10:32:26 +0000 (10:32 +0000)]
Merge "A better auto brightness"
Adrian Roos [Tue, 13 May 2014 12:55:09 +0000 (14:55 +0200)]
A better auto brightness
Bug:
14927472
Change-Id: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
Yohei Yukawa [Wed, 14 May 2014 08:02:31 +0000 (08:02 +0000)]
Merge "Support IMM#updateCursorAnchorInfo in Editor"
Yohei Yukawa [Mon, 12 May 2014 06:46:25 +0000 (15:46 +0900)]
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
Robert Greenwalt [Wed, 14 May 2014 05:39:09 +0000 (05:39 +0000)]
Merge "Add Network-specific host name resolution API."
Chulwoo Lee [Wed, 14 May 2014 02:31:51 +0000 (11:31 +0900)]
Fix NPE while dispatching input event.
- occasionally, TvView can be detached while
the input event is being processed.
BUG:
14791903
Change-Id: Id1def32ace1bf9765ae30a00ea4579670d1d40aa
Robert Greenwalt [Fri, 11 Apr 2014 22:53:27 +0000 (15:53 -0700)]
Add NetworkFactory support.
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.
bug:
13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b