Adam Powell
4c9e64c79e
am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev
...
* commit '51eee88c3355973ef648cef822f4a737c5b0a6b9':
Remove View methods that can't be used safely from the SDK
2014-09-12 05:03:53 +00:00
Craig Mautner
0c9505b316
am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev
...
* commit '790a059b487646bd6aae1cdc866261a57375bb01':
If activity is an alias get maxRecents from target
2014-09-12 05:03:47 +00:00
Jeff Davidson
fbe9263a98
am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
...
* commit '1e3977964e1cb0c14a7b3bc6f34e8f15583b93a3':
Update VpnService Javadoc to reflect new UX.
2014-09-12 05:03:42 +00:00
Craig Mautner
4bc2c64f8e
am 7f97f2c3: Merge "Add null check to TaskPersister file list." into lmp-dev
...
* commit '7f97f2c371b45540c313e72b2bd087162d91d666':
Add null check to TaskPersister file list.
2014-09-12 05:03:37 +00:00
Prerepa Viswanadham
44c8dfa2a1
am 041299e3: Remove onConnectionCongested callback
...
* commit '041299e377de125746800f5d4644d9fd4b793cf8':
Remove onConnectionCongested callback
2014-09-12 05:03:31 +00:00
Jeff Brown
0836f2f08b
am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
...
* commit '683872afea36e40fa8c962cd82b6e4753994f9d4':
Clean entire arg block when setting process name.
2014-09-12 05:03:26 +00:00
Svet Ganov
34e67af34f
am 60d4306b: Merge "Fix edit text error state in the print UI." into lmp-dev
...
* commit '60d4306bfd3125543b1a207c82b78e0bfbe7a8d4':
Fix edit text error state in the print UI.
2014-09-12 05:03:21 +00:00
George Mount
2b02b4e267
am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
...
* commit '4041d8edb771af9a96940def096637f6d8884fb9':
Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 05:03:17 +00:00
George Mount
fbb6299907
am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
...
* commit '3081e3601760871fea78d878e752b556974cb55b':
Have Activity Transitions activited by a new window attribute.
2014-09-12 05:03:12 +00:00
George Mount
8da635c9b1
am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev
...
* commit '51d20c877a7c23e273983146188f379fd2b52a6c':
Allow Path approximation to work with a single point Path.
2014-09-12 05:03:07 +00:00
Igor Murashkin
e77a5a5f2c
am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
...
* commit '6bb75a48f2b1fac3acb10b79f9172f1bbbabc2a6':
camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 05:03:03 +00:00
Sreeram Ramachandran
04e33e9a5b
am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
...
* commit '8ab9b4c765b7a05223e4013f6e1d8b810a0b272c':
Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 05:02:58 +00:00
Andrew Lee
cd79d78db1
am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev
...
* commit 'a523c405c9aeefcb7512d049adf76dcc6b247d42':
API cleanup for RemoteConnection.
2014-09-12 05:02:54 +00:00
Eric Rowe
a5bf3e25c4
am 92168d44: Merge "Fix wifi association tests" into lmp-dev
...
* commit '92168d4464f2a3b8e503db58ebf1a7c40f6c277e':
Fix wifi association tests
2014-09-12 05:02:48 +00:00
Anthony Lee
ed0d651338
am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev
...
* commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78':
isValidSlotId() and isValidPhoneId() updated to handle negatives.
2014-09-12 05:02:43 +00:00
ztenghui
525c65441e
am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
...
* commit '0a64dc71677c93909445b92f2c5a04659289941b':
Finer tessellation can draw better looking shadows for circles.
2014-09-12 05:02:39 +00:00
vandwalle
b12e0178bc
am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev
...
* commit 'c7fd0da2d924ac2b3f60288c777349020220fd33':
add option to link only same credential configurations
2014-09-12 05:02:34 +00:00
Christopher Tate
7febfee44f
am e32b2a5d: Merge "Write new wallpaper files from scratch..." into lmp-dev
...
* commit 'e32b2a5d2bdc3c8fd4caa00437d5616e3535d601':
Write new wallpaper files from scratch...
2014-09-12 05:02:30 +00:00
Nancy Chen
4a634a8c7b
am 03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev
...
* commit '03ee9f825ac4c4f629e6afd5993f3bc46adb6266':
Update TelecommManager per API requirements. (1/3)
2014-09-12 05:02:26 +00:00
Chris Craik
4cb524f81f
am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev
...
* commit 'e4c0e03bb23ae4ed64d91f8ba1c8976092252fff':
Update HWUI paint filter to understand new location of skia bitmap filter preference
2014-09-12 05:02:21 +00:00
Michael Wright
fd243b6cf2
am 54bc6182: Change callback methods from add to register.
...
* commit '54bc61826b7df0d1c466432c13b4f9782ffd4fad':
Change callback methods from add to register.
2014-09-12 05:02:16 +00:00
Chet Haase
6d942c8b7f
am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
...
* commit '05cafed09b5dbc2642ac5a93e580ad732f5b7e8d':
Make starting window hw-accelerated
2014-09-12 05:02:11 +00:00
Xin Guan
dcfc7f6996
am 314712e9: Temp enable the log to identify the wake up cause.
...
* commit '314712e95987acf944dbf7d1788fdcd6a14511a5':
Temp enable the log to identify the wake up cause.
2014-09-12 05:02:06 +00:00
Paul Lawrence
d189d67af2
am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
...
* commit '5f3e819f368f309472a8dfb6a40f733d3d8d5915':
Create correct files in dropbox on encrypted boot
2014-09-12 05:02:01 +00:00
Robin Lee
58d21fafee
am 7ac7a7d8: Update API
...
* commit '7ac7a7d875fb54a6d63a8918107bfb752cc56aba':
Update API
2014-09-12 05:01:55 +00:00
Adam Powell
fb008d6ac3
Merge "Remove View methods that can't be used safely from the SDK" into lmp-dev
2014-09-11 23:12:27 +00:00
Craig Mautner
3969cabf59
Merge "If activity is an alias get maxRecents from target" into lmp-dev
2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c
If activity is an alias get maxRecents from target
...
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.
Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).
Fixes bug 17391328.
Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
2014-09-11 15:53:44 -07:00
Jeff Davidson
8afddbe7e9
Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
2014-09-11 22:41:24 +00:00
Adam Powell
5eb3ffc24c
Remove View methods that can't be used safely from the SDK
...
View methods that previously accepted a TypedArray to initialize
parameters parsed from xml cannot be used correctly by apps. The
TypedArray passed must always be obtained from a context using the
filter array com.android.internal.R.styleable.View, which is not
visible to the SDK.
A previous change already made this safe for existing apps already
using it so that they don't crash, this change removes these methods
from the SDK entirely.
Change-Id: I62099087ad6fd5bf8363e863b04fd0434b8cdfca
2014-09-11 15:38:55 -07:00
Craig Mautner
532e551e68
Merge "Add null check to TaskPersister file list." into lmp-dev
2014-09-11 22:36:18 +00:00
Prerepa Viswanadham
ba4f57a1c6
Remove onConnectionCongested callback
...
Bug:17289507
Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +00:00
Jeff Brown
c46cd62b5c
Merge "Clean entire arg block when setting process name." into lmp-dev
2014-09-11 22:28:43 +00:00
Svet Ganov
c946e9ab46
Merge "Fix edit text error state in the print UI." into lmp-dev
2014-09-11 22:15:59 +00:00
George Mount
e6f66e78a5
Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
2014-09-11 22:08:36 +00:00
George Mount
04600023d0
Fixed: TransitionSet setStartDelay did nothing.
...
Bug 17452965
Change-Id: Id2fd6ed3bd8e7156dd3d22dcd83117cec12e3528
2014-09-11 14:59:58 -07:00
George Mount
db352c7835
Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
2014-09-11 21:54:13 +00:00
George Mount
784ab49b6e
Merge "Allow Path approximation to work with a single point Path." into lmp-dev
2014-09-11 21:51:58 +00:00
Igor Murashkin
6894f60c9c
Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
2014-09-11 21:50:34 +00:00
Jeff Davidson
6d6ea3b6be
Update VpnService Javadoc to reflect new UX.
...
The major change is that consent is now "sticky" and lasts until the
user explicitly disables the VPN connection.
Bug: 17474362
Change-Id: Id4e7807e635bbfc7645741135209d46763e280f9
2014-09-11 14:44:31 -07: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
Andrew Lee
6f90967b0c
Merge "API cleanup for RemoteConnection." into lmp-dev
2014-09-11 21:24:35 +00:00
Eric Rowe
a8e4c740a8
Merge "Fix wifi association tests" into lmp-dev
2014-09-11 21:23:01 +00:00
Anthony Lee
5e6e52a078
Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev
2014-09-11 21:21:07 +00:00
Jeff Brown
00c0cd4a24
Clean entire arg block when setting process name.
...
When Android processes fork from Zygote, we rewrite the command line
with a new name, eg. "system_server". When we do this, we should
fill the entire block with zeros to remove corrupted argument
information that may otherwise remain in the /proc/<pid>/cmdline buffer
and be seen in tools and stack dumps.
Fixed an issue where VM options could be overwritten after setting
the nice name if the name was too long.
Bug: 17474152
Change-Id: Ie6cf9ed7752a04300a340e26cd6812bb35c59e1b
2014-09-11 14:19:52 -07: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
ztenghui
24a95a10db
Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
2014-09-11 21:09:51 +00:00
vandwalle
b55ccdad03
Merge "add option to link only same credential configurations" into lmp-dev
2014-09-11 21:05:54 +00:00
Christopher Tate
1fdfaa2e82
Merge "Write new wallpaper files from scratch..." into lmp-dev
2014-09-11 21:05:50 +00:00