OSDN Git Service
Wale Ogunwale [Tue, 1 Dec 2015 15:21:59 +0000 (07:21 -0800)]
Add bounds information to stack/task WM dump
Change-Id: I01b0bf1feb2412f9ce73b2317ba6a56b48bc1a97
George Mount [Tue, 1 Dec 2015 15:19:56 +0000 (15:19 +0000)]
Merge "Choose the correct Fragment to pull a Transiton from."
George Mount [Tue, 1 Dec 2015 15:19:27 +0000 (15:19 +0000)]
Merge "Give transitioning fragment a context prior to retrieving transition"
Abodunrinwa Toki [Mon, 30 Nov 2015 19:45:32 +0000 (19:45 +0000)]
TextView tests to check that selection handles appear on selection
Bug:
25730231
Change-Id: I66e44b6375e1a76e8537fca5dc5090ff841cc934
Przemyslaw Szczepaniak [Tue, 1 Dec 2015 10:02:43 +0000 (10:02 +0000)]
Merge "Move StrictJarFile from libcore to framework"
Daichi Hirono [Tue, 1 Dec 2015 07:42:12 +0000 (07:42 +0000)]
Merge "Handle Android M as a MTP device in MtpManagerTest."
Daichi Hirono [Tue, 1 Dec 2015 04:51:58 +0000 (13:51 +0900)]
Handle Android M as a MTP device in MtpManagerTest.
MtpManagerTest uses real MTP device to test functionallity, but
previously it did not handle Android M's USB client behavior.
BUG=
25939006
Change-Id: I53fa8c08c41c3adacf85f24694afdea5ec0781ca
Insun Kang [Thu, 26 Nov 2015 06:35:44 +0000 (15:35 +0900)]
MediaSession: Improve MediaSessionStack logic
There was an issue that media button events (play / pause) didn’t go
to the expected media session. If an app creates a media session during
all media sessions are paused, the next coming media play event is
consumed by the newly created media session. It makes sense in general,
but if the media session is created in a background process without any
visible UI, it causes unexpected results.
This patch resolves the issue by checking if a newly added session comes
from the most recent user-facing app.
Bug:
24990104
Change-Id: Ic9632bced37bffd28260afe3523d9a20ea4d3c21
Lorenzo Colitti [Tue, 1 Dec 2015 03:24:08 +0000 (03:24 +0000)]
Merge "Don't show "Connected, no Internet" any longer than necessary."
Selim Cinek [Mon, 30 Nov 2015 22:25:38 +0000 (14:25 -0800)]
Finetunes parts of the notification templates
The header wasn’t positioned perfectly before
Change-Id: If3c0ea0eb7da7307d1bef7cd8036d4118243a1f1
Selim Cinek [Wed, 25 Nov 2015 02:39:02 +0000 (18:39 -0800)]
Fixed the templates for the notifcation actions
Change-Id: Iac6296cc487a61e1601facb4603a7d96923d490f
Selim Cinek [Tue, 24 Nov 2015 02:01:33 +0000 (18:01 -0800)]
Fixed a bug where the notification icon would stop animating
For notification children, the notification header or when updated
the notification icon would sometimes stop animating.
This is now fixed.
Change-Id: Id8ed4e1c548cd1cf4d5ea18b8e4084a376998c14
Selim Cinek [Tue, 24 Nov 2015 01:48:07 +0000 (17:48 -0800)]
Cleaned up the updating of notifications
Some states were not correctly updated which could lead to
small bugs when the update was not in-place.
Change-Id: If133029acf65a9af8d297314fee5f1cd9e2015bd
Selim Cinek [Mon, 23 Nov 2015 21:51:13 +0000 (13:51 -0800)]
Migrated the systemUI based notification header
Previously the notification header had a seperate implementation
in SystemUI from which the platform implementation was derived.
Now that everything is in the framework, we’re migrating the
implementation for notification groups.ß
Change-Id: Ia61a75bd6c85e1805d4364a9e7e4587a020c1271
Selim Cinek [Sat, 21 Nov 2015 01:00:18 +0000 (17:00 -0800)]
Migrated the onTouchListener of the header to its view
In order to ensure reusability and separate inflation,
the expand touch listener is now moved to its view.
Change-Id: I363fc4ae2c68833dc9f1258398ec9ad3bf44dc7f
Selim Cinek [Fri, 20 Nov 2015 23:57:26 +0000 (15:57 -0800)]
Fixed the inbox line padding with an image
If an image was present, the first line of the
Inbox style could run into the image. This Is fixed
now.
Change-Id: I60ee22166a2dc1d2de2f1fe311effc419a95748d
Selim Cinek [Fri, 20 Nov 2015 20:47:59 +0000 (12:47 -0800)]
Added the dozemode for the new notification templates
Previously things were not correctly inverted when dozing,
because of the new template design.
Change-Id: I05211a463c4c7aa3bcba669506975844c389097b
Selim Cinek [Fri, 20 Nov 2015 02:10:48 +0000 (18:10 -0800)]
Made the bigtext now nicely float around the image
If there is an image instead of applying the same
margin everywhere, the text now floats around the
image.
Change-Id: I87f9ca9f51fb270b0732a99374544381bd1fc4e0
Selim Cinek [Thu, 19 Nov 2015 20:00:45 +0000 (12:00 -0800)]
Legacy custom views now get properly layed out again
Since the minheight grew, all notifications grew.
Legacy custom notifications need to stay the same
height though.
Change-Id: I469c448014c3d3c31526466d06a60ac44838b274
Selim Cinek [Thu, 19 Nov 2015 04:24:13 +0000 (20:24 -0800)]
Implemented the progressbar for the new templates
The padding was off in a few cases and the layout
was jumping when expanding when there were actions
Change-Id: Ia9a9ddbfd1c9a8104278a56ce6e1ef2a4ceafbe9
Selim Cinek [Wed, 18 Nov 2015 03:04:39 +0000 (19:04 -0800)]
Continued implementing the notification templates
The progressbar is now also adapted to always have
at most 2 lines.
Change-Id: I092cf2fdfbbd474288398106309ad2ca85b7054b
Selim Cinek [Wed, 18 Nov 2015 18:25:23 +0000 (10:25 -0800)]
Determining the number of keyguard notifications dynamically
Instead of having a fixed number, we are now calculating the number
dynamically based on the available notifications.
This is necessary since notifications might have different sizes now.
Change-Id: I0cbe9b1c5fd731a89c242202846f42bec3fc57eb
Selim Cinek [Wed, 18 Nov 2015 19:53:47 +0000 (11:53 -0800)]
Fixed a bug where the notifications could get scrolled on keyguard
When dragging down due to falsing, the scrollposition could
become modified and never reset again.
Change-Id: I15d24dc8a5a3302faeaf30fb20a81d77dcceb059
Selim Cinek [Mon, 16 Nov 2015 18:40:56 +0000 (10:40 -0800)]
Adapted the big picture template
Change-Id: Ia66c5f12a8688b2f0c6ea51fb8dbdefc39f62f8f
Selim Cinek [Fri, 13 Nov 2015 18:18:09 +0000 (13:18 -0500)]
Made the subtexts consistent among expanded / collapsed version
To ensure that the position of the expandbutton stays.
Change-Id: I02078fed1a2b31ff6e3b0f9b2db3c4e2844acd09
Selim Cinek [Thu, 12 Nov 2015 20:49:14 +0000 (15:49 -0500)]
Improved notification templates further
Inbox and bigtext style are adapted.
Change-Id: I85b33f7387a2bde46fc73d2bc82538d6d13f0a70
Selim Cinek [Wed, 11 Nov 2015 16:48:36 +0000 (11:48 -0500)]
Switched the expanded button of the big content view
Previously it was always the same.
Change-Id: Iebfbf6203241356d5acdfa5b16b02f976c8ce310
Selim Cinek [Tue, 10 Nov 2015 22:44:39 +0000 (17:44 -0500)]
Adapted the layout for when the header would overflow
Now first the App name shrinks up to a minumum and then
the subtext shrinks. This way the expand button is always
visible.
Change-Id: Ibda8e9efbac7119cc31ce4c129be33a7a192f974
Selim Cinek [Wed, 11 Nov 2015 00:14:27 +0000 (19:14 -0500)]
Updated the media notification template
The media notification now lives in the new world
with the appropriate notification header.
Change-Id: Ifed0f12e4925e27a303f6f01faa2e9c17262d486
Selim Cinek [Mon, 26 Oct 2015 21:11:31 +0000 (14:11 -0700)]
Update the notification templates
Most of the notification templates have been updated.
Some cases like media notifications don't yet work well
but will be fixed in a later CL.
Bug:
25376106
Change-Id: I26c366e58ebba3852cea20de6fca311bd302bb24
Winson Chung [Tue, 1 Dec 2015 01:19:41 +0000 (01:19 +0000)]
Merge "Fixing several bugs."
Jorim Jaggi [Tue, 1 Dec 2015 01:17:19 +0000 (01:17 +0000)]
Merge "Don't animate when moving task to stack if not requested"
Jeff Sharkey [Tue, 1 Dec 2015 01:03:39 +0000 (01:03 +0000)]
Merge "API to create SharedPreferences from File."
Winson [Mon, 30 Nov 2015 22:53:12 +0000 (14:53 -0800)]
Fixing several bugs.
- Prevent long pressing to drag when a task is already docked
- Ensure that the history button has a bit of background protection
- When fast-toggling, the second tap should actually activate the
second task and not the third
- Align the history view with the stack view
- Fixing regression launching affiliated tasks
Bug:
25931916
Change-Id: I9d74d0d2427ea0b11f4817d0e635013065e3a792
Jeff Sharkey [Tue, 1 Dec 2015 00:51:00 +0000 (17:51 -0700)]
API to create SharedPreferences from File.
Needed to support storage of SharedPreferences on both credential-
encrypted and device-encrypted storage paths.
Bug:
22358539
Change-Id: I576b696951b2a9de817d5be63d31b06f7e166a19
Jeff Sharkey [Tue, 1 Dec 2015 00:13:00 +0000 (00:13 +0000)]
Merge "Wire up lifecycle, send unlocked broadcast."
Jeff Sharkey [Mon, 30 Nov 2015 19:52:10 +0000 (12:52 -0700)]
Wire up lifecycle, send unlocked broadcast.
When the correct lock pattern is presented, ask the system to also
unlock credential-encrypted storage, if enabled. The token passed
along is empty for now, but can be wired up to gatekeeper in the
future.
During each system boot, ask vold to lock all users keys to give us
a known starting state. This also has the effect of chmod'ing away
any CE data when in emulation mode.
Define and send a new foreground broadcast when the CE storage is
unlocked for the first time. Add stronger last-ditch checking for
encryption-awareness before starting an app.
Bug:
22358539
Change-Id: Id1f1bece96a2b4e6f061214d565d51c7396ab521
Filip Gruszczynski [Mon, 30 Nov 2015 23:37:02 +0000 (23:37 +0000)]
Merge "Remove dock divider surface when it's not visible."
Lifu Tang [Mon, 30 Nov 2015 23:23:55 +0000 (23:23 +0000)]
Merge "Remembers previous location mode when location off"
Filip Gruszczynski [Mon, 30 Nov 2015 05:10:07 +0000 (21:10 -0800)]
Remove dock divider surface when it's not visible.
We achieve the removal by notifying System UI about the visibility of
the dock divider. This way System UI can change visibility of the root
view, which in turn will cause the WMS to destroy or create the surface
as necessary.
Bug:
25844096
Bug:
25683717
Change-Id: Idbc33368db697a059af49106dfadb80c3d7d06c1
Adam Lesinski [Mon, 30 Nov 2015 23:20:25 +0000 (23:20 +0000)]
Merge "Implement AAPT Bundle format"
Winson Chung [Mon, 30 Nov 2015 23:02:14 +0000 (23:02 +0000)]
Merge "Improving drag and drop"
Felipe Leme [Mon, 30 Nov 2015 23:01:04 +0000 (23:01 +0000)]
Merge "Created a new bug report workflow so user can keep track of its progress."
Tom Taylor [Mon, 30 Nov 2015 23:00:11 +0000 (23:00 +0000)]
Merge "Add two new intents"
Adam Lesinski [Wed, 28 Oct 2015 22:44:27 +0000 (15:44 -0700)]
Implement AAPT Bundle format
AAPT will scan XML files looking for the <aapt:attr> XML tag.
<!-- @layout/bundle.xml -->
<ImageView xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:src">
<vector android:pathData="..." ...>
</vector>
</aapt:attr>
</ImageView>
The SINGLE child element of the <aapt:attr> tag is extracted into its own top
level resource. It is given a generated name.
The parent element of <aapt:attr> is then given the resource attribute that was assigned
to the `name' attribute. The value is set to a reference to the generated resource.
<!-- @layout/bundle.xml -->
<ImageView android:src="@drawable/bundle_1.xml">
</ImageView>
<!-- @layout/bundle_1.xml -->
<vector android:pathData="..." ...>
</vector>
Bug:
22627686
Change-Id: I8575fc4f739011402662fbf6b3db96df0012f598
Phil Weaver [Fri, 20 Nov 2015 22:46:28 +0000 (14:46 -0800)]
Ignore feedbackType in AccessibilityEvent dispatch
Send AccessibilityEvents to all accessibility services
that request them. No longer refuse to send them to
services with the same feedback type.
Change-Id: I137905c24fc75c075ab938175ecb6ea5f39112cf
Chien-Yu Chen [Mon, 30 Nov 2015 21:47:54 +0000 (21:47 +0000)]
Merge "Add and copy video stop sound"
Tom Taylor [Mon, 30 Nov 2015 21:45:52 +0000 (13:45 -0800)]
Add two new intents
One intent notifies the new and previous default sms app when the user
changes which app is the default sms app. The second intent is sent to the
default sms app when some other white-listed app, such as Android Auto or
the phone, modifies the Telephony db behind the default sms app's back.
Change-Id: Iee1e1c4a4c299846f382bd8247c295cf7aaa040e
Adam Lesinski [Mon, 30 Nov 2015 21:08:00 +0000 (21:08 +0000)]
Merge "Revert "Implement AAPT Bundle format""
Adam Lesinski [Mon, 30 Nov 2015 21:07:44 +0000 (21:07 +0000)]
Revert "Implement AAPT Bundle format"
This reverts commit
9d0f7d44d5cc5322415f52f7ce03cc37a478b350.
Caused a build breakage when parsing some attributes.
Change-Id: I89ca958b2f2e820d353648df8aadd90bbe8d8339
Raph Levien [Mon, 30 Nov 2015 21:07:07 +0000 (21:07 +0000)]
Merge "Always invalidate TextView on checkForRelayout"
Alan Viverette [Wed, 25 Nov 2015 19:30:08 +0000 (14:30 -0500)]
Always invalidate TextView on checkForRelayout
Previously we would check whether relayout was required and optionally
invalidate; however, with partial layout we leave this work for the
makeNewLayout() method. We still need to manually invalidate, though,
since makeNewLayout() does not handle invalidation.
Bug:
25857300
Change-Id: I81ef9062c9fb4964d5e42a3562e6c782492ad65f
Jason Monk [Mon, 30 Nov 2015 20:11:00 +0000 (20:11 +0000)]
Merge "Guard against monkey crash"
Jason Monk [Mon, 30 Nov 2015 20:05:35 +0000 (15:05 -0500)]
Guard against monkey crash
Bug:
25795998
Change-Id: I351faae1e29d09b7577435207ec466a1ff5ed237
Adam Lesinski [Mon, 30 Nov 2015 19:51:53 +0000 (19:51 +0000)]
Merge "Implement AAPT Bundle format"
Adam Lesinski [Mon, 30 Nov 2015 19:30:48 +0000 (19:30 +0000)]
Merge "AAPT2: Support compiling a res/ directory and output to zip"
Bryce Lee [Mon, 30 Nov 2015 19:17:53 +0000 (19:17 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583 am:
b241487c16 am:
64e41590d2
am:
0ca7de9031
* commit '
0ca7de90310034d118f21343a69a38ebc02dd0bc':
Add callback for connections to be notified when the ringer is silenced.
Adam Lesinski [Wed, 25 Nov 2015 03:11:46 +0000 (19:11 -0800)]
AAPT2: Support compiling a res/ directory and output to zip
This allows us to compile an entire directory and output to a single
file. This is important to support generated resources in the make
build, since we may not know what resources get generated.
The link step will accept the zip and read the contents of it as if they
were passed in on the command line.
Change-Id: If1a51b0abe772350c24074353eb4989953c2e0cb
Bryce Lee [Mon, 30 Nov 2015 19:09:17 +0000 (19:09 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583 am:
b241487c16
am:
64e41590d2
* commit '
64e41590d246cf1fc548b72d40436bcd2fca7b06':
Add callback for connections to be notified when the ringer is silenced.
Chong Zhang [Mon, 30 Nov 2015 19:03:47 +0000 (19:03 +0000)]
Merge "Show all windows with FLAG_SHOW_WHEN_LOCKED over lock screen if"
Bryce Lee [Mon, 30 Nov 2015 19:02:38 +0000 (19:02 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583
am:
b241487c16
* commit '
b241487c16976a3f0aa6592740bba15f489eab17':
Add callback for connections to be notified when the ringer is silenced.
George Mount [Mon, 30 Nov 2015 18:32:47 +0000 (10:32 -0800)]
Choose the correct Fragment to pull a Transiton from.
Bug
25375640
When popping multiple back stacks or replacing multiple times
within a transaction, the wrong fragment could have been
chosen. This normally occured when one of the Fragments had
a null Transition.
Change-Id: Ic2c842d9228ee7d26bf067016cb3f307bdf92991
Bryce Lee [Mon, 30 Nov 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
am:
52bdf11583
* commit '
52bdf11583366322ca14d69b895ac451a71245db':
Add callback for connections to be notified when the ringer is silenced.
George Mount [Mon, 30 Nov 2015 18:55:20 +0000 (10:55 -0800)]
Give transitioning fragment a context prior to retrieving transition
Bug
23688972
An incoming fragment that is going to execute a transition may
need to have a context in order to load the transition. This
CL moves the state of incoming fragments to CREATED prior to
getting their Transitions.
Change-Id: I08b8cda479f7542fb326aa4f0f62a07ccc5662b0
Bryce Lee [Mon, 30 Nov 2015 18:51:39 +0000 (18:51 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
Filip Gruszczynski [Mon, 30 Nov 2015 18:38:44 +0000 (18:38 +0000)]
Merge "Remove unnecessary field from AppWindowToken."
Erik Wolsheimer [Mon, 30 Nov 2015 17:43:39 +0000 (17:43 +0000)]
Geoff Mendal [Mon, 30 Nov 2015 17:36:56 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Erik Wolsheimer [Mon, 30 Nov 2015 17:35:20 +0000 (17:35 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd am:
1dbb0355dc
am:
1d92c4538f
* commit '
1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:28:44 +0000 (17:28 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd
am:
1dbb0355dc
* commit '
1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:22:56 +0000 (17:22 +0000)]
fix data race condition BUG:
25819358
am:
2242b4d2bd
* commit '
2242b4d2bda7f83cf7813103ff95d9b4e244126f':
fix data race condition BUG:
25819358
Geoff Mendal [Mon, 30 Nov 2015 16:52:28 +0000 (17:52 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ib74fe15ebdef92bece862bc5ffa0dd908838fe02
Auto-generated-cl: translation import
Alan Treadway [Thu, 26 Nov 2015 15:30:37 +0000 (15:30 +0000)]
Fix for being able to setup Managed User from system user.
Also move feature flag check to ensure it is used in all cases.
Change-Id: If42787c5bc9ab824449c70f90fb827cf2da7507f
Lorenzo Colitti [Thu, 26 Nov 2015 07:55:15 +0000 (16:55 +0900)]
Don't show "Connected, no Internet" any longer than necessary.
Currently, both the wifi detail view in Quick Settings and the
wifi settings screen show "connected, no internet" for a few
seconds after a network connects. This makes it seem that
network validation is slow, even though usually it only takes
tens or hundreds of milliseconds.
Fix this by updating the access point list when we receive an
onCapabilitiesChanged NetworkCallback for the current wifi
connection.
This also allows us to stop listening to the RSSI_CHANGED_ACTION
broadcast, because:
1. WifiStateMachine only ever sends out that broadcast just after
calling updateCapabilities, which causes an
onCapabilitiesChanged callback to be received.
2. We don't use any of the extras in the RSSI_CHANGED_ACTION
broadcast, only call updateNetworkInfo, which we do on
every onCapabilitiesChanged callback anyway.
While I'm at it, move a variable assignment around to improve
clarity.
Change-Id: I57d3a13754ba4d8c6d58c566713d3f07d0ed2476
Alan Viverette [Mon, 30 Nov 2015 14:59:23 +0000 (14:59 +0000)]
Merge "Avoid concurrent modification for pending partial layout views"
Niels Egberts [Mon, 30 Nov 2015 14:05:36 +0000 (14:05 +0000)]
Merge "Small refactoring for FileSynthesisCallback."
Geoff Mendal [Mon, 30 Nov 2015 14:02:17 +0000 (14:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Niels Egberts [Fri, 20 Nov 2015 12:05:55 +0000 (12:05 +0000)]
Small refactoring for FileSynthesisCallback.
Removed unused callerIdentity member and removed null checks
for the dispatcher.
Change-Id: I2983f5d48a7a593bc998ba4e033f1e815fa61819
Geoff Mendal [Mon, 30 Nov 2015 14:01:01 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 30 Nov 2015 14:00:02 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 30 Nov 2015 13:57:50 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4247a09a0c94930c560bf92822248a4fc59903ac
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Nov 2015 13:53:19 +0000 (05:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie068d54293b15d002ed53fd82761723a7085c6d9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Nov 2015 13:51:51 +0000 (05:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ida232117d56cfc78ecf7daadb2f6642a6341b3bc
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Nov 2015 13:23:55 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I155086153a515040b16b3643b4bf40400fcbd922
Auto-generated-cl: translation import
Daichi Hirono [Mon, 30 Nov 2015 01:08:06 +0000 (01:08 +0000)]
Merge "Reopen MTP devices when the provider is created."
Daichi Hirono [Thu, 26 Nov 2015 06:20:08 +0000 (15:20 +0900)]
Reopen MTP devices when the provider is created.
When the provider is created, it reopens MTP devices that are recorded
in the database. It enables the provider to resume MTP session after the
provider process is killed by the system.
BUG=
25704854
Change-Id: I58ae80fdb2e02cb0f045c63c4ade8943e2baae06
Chad Brubaker [Mon, 30 Nov 2015 00:00:44 +0000 (00:00 +0000)]
Merge "Remove isCertificateEntry check" am:
7d72975c5b am:
59919babe0
am:
19c7afab62
* commit '
19c7afab6244303e78bbc6b5ab04520bbd4172d7':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:56:01 +0000 (23:56 +0000)]
Merge "Remove isCertificateEntry check" am:
7d72975c5b
am:
59919babe0
* commit '
59919babe0763980ae0a3977e2701ad2d81a6cbe':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:50:33 +0000 (23:50 +0000)]
Merge "Remove isCertificateEntry check"
am:
7d72975c5b
* commit '
7d72975c5b3e6f18710f078199e7a9e3f9376c60':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:45:47 +0000 (23:45 +0000)]
Merge "Remove isCertificateEntry check"
Zhijun He [Fri, 27 Nov 2015 20:58:34 +0000 (12:58 -0800)]
Camera2: fix build break
Change-Id: I1641c012eb34fee15b1f4ffa3206de7631014440
Zhijun He [Fri, 27 Nov 2015 20:40:10 +0000 (20:40 +0000)]
Merge "Camera2: update dynamic black level type"
Przemyslaw Szczepaniak [Tue, 3 Nov 2015 09:47:56 +0000 (09:47 +0000)]
Move StrictJarFile from libcore to framework
Bug:
25337946
Change-Id: Ib4fac6fa9f534b8654e5ca158bbaedb2393772ba
(cherrypicked from
43ea2cc2a81926a6b2ca13d41f4eab089640129e)
Lorenzo Colitti [Fri, 27 Nov 2015 03:09:33 +0000 (03:09 +0000)]
Merge "Don't match network requests to legacy API requests."
Lorenzo Colitti [Fri, 27 Nov 2015 03:04:31 +0000 (03:04 +0000)]
Merge "Fix one of the breakages of ConnectivityServiceTest in "
Lorenzo Colitti [Wed, 25 Nov 2015 11:28:50 +0000 (20:28 +0900)]
Don't match network requests to legacy API requests.
Currently, we look at network requests that are created by the
current requestNetwork API to see if they look like requests
that could have been created using the legacy
startUsingNetworkFeature API.
This causes those networks to be added to LegacyTypeTracker,
and so cause CONNECTIVITY_ACTION broadcasts, be accessible
using getNetworkInfo(int type), etc. This was done in the L
timeframe so that apps could request networks using the
then-new requestNetwork APIs and still use them using legacy
APIs such as requestRouteToHost.
However, the resulting CONNECTIVITY_ACTION broadcasts are
expensive. requestRouteToHost has been deprecated since L, and
mixing the old and new APIs was never recommended, so it's time
to delete this hack.
Bug:
22513439
Bug:
23350688
Bug:
25295964
Change-Id: Id867058446e5ee44396743d126d26fa57da0c990
Lorenzo Colitti [Fri, 27 Nov 2015 01:52:10 +0000 (10:52 +0900)]
Fix one of the breakages of ConnectivityServiceTest in
Change-Id: I31c7a019383fa589beb1572486700e54edfb97e8
Chad Brubaker [Thu, 26 Nov 2015 22:00:50 +0000 (14:00 -0800)]
Remove isCertificateEntry check
This was returning false on some test keystores even when
getCertificate would correct return a certificate. Remove the check to
be consistent with how conscrypt loads trust anchors from the keystore.
Bug:
25897324
Change-Id: Ie87658a261ee7ba1cca6896e34b6c53b8abfba85
Erik Kline [Thu, 26 Nov 2015 08:57:18 +0000 (08:57 +0000)]
Merge "Stop using startUsingNetworkFeature"
Lorenzo Colitti [Thu, 26 Nov 2015 08:16:51 +0000 (08:16 +0000)]
Merge "Fix javadoc for the NetworkRequest version of requestNetwork."