56747 Commits

Author SHA1 Message Date
Igor Murashkin
6894f60c9c Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 2014-09-11 21:50:34 +00:00
Sreeram Ramachandran
623ce7f779 Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 2014-09-11 21:39:08 +00:00
Eric Rowe
a8e4c740a8 Merge "Fix wifi association tests" into lmp-dev 2014-09-11 21:23:01 +00:00
Sreeram Ramachandran
a1e06807ee Hide mutable VpnService APIs to add/remove IP addresses dynamically.
These APIs were added because we thought we needed them to provide
seamless transition from one server backend to another using local IP
addresses to distinguish between the backends. I.e., connections whose
local IP address was old would be routed to the old backend; connections
whose local IP address was new would be routed to the new backend.

It turns out that's not needed. VpnService already supports seamless
re-establishment, so VPNs just need to call establish() again with a
different IP address. I've verified with a custom VPN app that this
works, and can distinguish traffic based on the old and new addresses.

Nobody is using these APIs at the moment, so we could even consider
removing them altogether, but I prefer just hiding them, just in case.

Bug: 15409819
Change-Id: I30949926a0f859c9d839981ccbc5d8e1e535a3a5
2014-09-11 14:17:10 -07:00
Eric Rowe
485ceb8506 Fix wifi association tests
Before fix, test assumed that it was already connected to wifi so remove
these assertions.  Also, since association test may be used against
access points with no outside connectivity, remove the ping test to
8.8.8.8 at the end.

Change-Id: I3d4f3d752b72028f642da9f8e9adda4ad18a6a56
2014-09-11 14:14:25 -07:00
vandwalle
b55ccdad03 Merge "add option to link only same credential configurations" into lmp-dev 2014-09-11 21:05:54 +00:00
Igor Murashkin
442395751d camera2.legacy: Add aberration, noisereduction, timestamp source keys
Bug: 17328591
Change-Id: I037908e0db505ace1ef62d5aa0622596d8fa2713
2014-09-11 13:21:37 -07:00
Chet Haase
969e543b32 Merge "Make starting window hw-accelerated" into lmp-dev 2014-09-11 19:32:00 +00:00
Chet Haase
4f52b34206 Make starting window hw-accelerated
An earlier fix in L disabled hw acceleration for the starting window
after the system process became hw accelerated. This was done to preserve
the old behavior of the starting window having some default behavior
(in particular, being filled with a default color). However, this ends up
being a memory and performance problem on some platforms (memory because
some platforms have backing store for software surfaces, performance
because it takes far longer to create a screen-size software surface than
a hardware surface).

The fix is to allow the starting window to inherit the hw acceleration
behavior of its process, and to detect when we are drawing the contents
of that starting window and to fill it with a default color (black).

Issue #17443449 use hardware rendering for app preview window

Change-Id: I8be8111d9e38c51fbbc07185acca065815ce26dc
2014-09-11 12:28:29 -07:00
Paul Lawrence
280813a6d9 Merge "Create correct files in dropbox on encrypted boot" into lmp-dev 2014-09-11 19:16:15 +00:00
Paul Lawrence
91317107a3 Create correct files in dropbox on encrypted boot
On the minimal framework start, don't mark ro.runtime.firstboot, allowing
the real framework to properly create the dropbox files in the real /data

Bug: 17450632
Change-Id: Ic53b3471b44e69f3eea7e3f3de18e789f51192bc
2014-09-11 12:09:56 -07:00
Alan Viverette
cdea76488d Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 2014-09-11 18:27:43 +00:00
Robin Lee
484d8bd79a Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 2014-09-11 18:22:40 +00:00
RoboErik
1308c4b82b Merge "Update text appearance in leanback setup" into lmp-dev 2014-09-11 18:21:33 +00:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-11 19:17:00 +01:00
Vineeta Srivastava
e14a29ff3d Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 2014-09-11 17:41:02 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
RoboErik
7a058d4c5e Update text appearance in leanback setup
Changes the size and inter-line spacing.

bug:16959057
Change-Id: Iaf3dcb6c60d071920d73ac2f86e01b6d4248ebf9
2014-09-11 10:03:27 -07:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
2014-09-11 09:49:45 -07:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet.
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Yohei Yukawa
e5fe4bc96d Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 2014-09-11 15:32:16 +00:00
Baligh Uddin
ef9517f019 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:31 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Yohei Yukawa
d77adfe52d Enrich test cases when enabling default IMEs part 3
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- A dummy Hinglish IME ("en_US" + "hi") is added
- Added test cases where system locale is "en_GB",
  "en_IN", and "hi" as well as "en_US".

BUG: 17347871
Change-Id: Iacf0f47c4dbc147f8153df50ba58fc4da4dacd29
2014-09-12 00:07:41 +09:00
Yohei Yukawa
91f49ed13c Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 2014-09-11 14:50:01 +00:00
Yohei Yukawa
bca817b2e2 Enrich test cases when enabling default IMEs part 2
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isSystemReady == false is now coverted.
- tests can run even when the system locale of test
  environment is different from "en_US"

BUG: 17347871

Change-Id: I9434270735d3b37d8b788d41250b23d7950aaeed
2014-09-11 23:44:43 +09:00
Adam Connors
e107c3eb79 Remove package level intent forwarding.
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
2014-09-11 15:42:13 +01:00
Paul Jensen
204dc65f37 Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 2014-09-11 13:15:22 +00:00
Paul Jensen
5236971bbf Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 2014-09-11 12:57:33 +00:00
Jorim Jaggi
0cf327daf3 Merge "Fix inconsistent layout param in notification" into lmp-dev 2014-09-11 12:40:04 +00:00
vandwalle
5df82ba65b add option to link only same credential configurations
Change-Id: I438b753974d3215ec7961628a0b4ddc4c3136c0b
2014-09-11 02:21:13 -07:00
Yohei Yukawa
726f2fe3c9 Merge "Enrich test cases when enabling default IMEs" into lmp-dev 2014-09-11 06:53:48 +00:00
Yohei Yukawa
cfcbddaff2 Enrich test cases when enabling default IMEs
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isAsciiCapable is now annotated accordingly.
- "dummy.keyboard0" now has several subtypes like
  "en_GB", "en_IN", "hi", "hi_ZZ" like the AOSP
  LatinIME.

BUG: 17347871
Change-Id: Ide698ed11c2539ba5862e6b37ea63ed19f8ce566
2014-09-11 11:15:18 +09:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
023b6812ab Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 2014-09-11 00:56:41 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Matthew Williams
03a4da6e8e Add flag to JobParameters for job expired
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
2014-09-10 17:32:18 -07:00
Paul Jensen
07ed07459a Make Network.openConnection() share HttpHandlers not OkHttpClients.
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.

bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa
2014-09-11 00:25:50 +00:00
Alan Viverette
07b900fff0 Enable adjustViewBounds on preference icon so that maxWidth is used
BUG: 17437258
Change-Id: I87fcd8bfb5936aaf321f65d2b181a8dfddf3c973
2014-09-10 17:19:18 -07:00
Amith Yamasani
8cd28b57ed Apply cross-user restrictions to Shell
Even though Shell user is allowed to perform cross-user actions,
lock that path down if the target user has restrictions imposed by
the profile owner device admin that prevents access via adb.

If the profile owner has imposed DISALLOW_DEBUGGING_FEATURES, don't
allow the shell user to make the following types of calls:
start activities, make service calls, access content providers,
send broadcasts, block/unblock packages, clear user data, etc.

Bug: 15086577
Change-Id: I9669fc165953076f786ed51cbc17d20d6fa995c3
2014-09-10 17:15:06 -07:00
Dianne Hackborn
652973fca8 Fix issue #17414533: update batterystats occasionally takes a couple...
...hundred milliseconds.

Rework the locking so that no critical paths block on the cpu collection.

Change-Id: Ie615a033f7f8b523b67abee62c581d1a8fce324c
2014-09-10 17:11:22 -07:00
Alan Viverette
5878076456 Use Calendar day of week rather than Time in SimpleMonthView
BUG: 17377360
Change-Id: I685f35b760c049edaa8934eccaf5ce1bbf326cf2
2014-09-10 17:09:13 -07:00