Narayan Kamath
f33376845d
Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev am: 8bff8a4e47
...
am: ceda51e563
* commit 'ceda51e563786c1e3372b4197db351b2d3969144':
Track libcore change 9fbdd1b27de1a3d1005468108.
2016-02-12 15:49:13 +00:00
Narayan Kamath
ceda51e563
Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev
...
am: 8bff8a4e47
* commit '8bff8a4e47159385c0416a076cd8f98b72aa9cfb':
Track libcore change 9fbdd1b27de1a3d1005468108.
2016-02-12 15:46:09 +00:00
Narayan Kamath
8bff8a4e47
Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev
2016-02-12 15:41:33 +00:00
Kenny Guy
15f6de3dd2
Merge "Support FBE for managed profiles." into nyc-dev am: 716a9e1892
...
am: 86dd0f2a9b
* commit '86dd0f2a9b907f2f8a9cdce2fc7f052916778cd7':
Support FBE for managed profiles.
2016-02-12 15:10:00 +00:00
Kenny Guy
86dd0f2a9b
Merge "Support FBE for managed profiles." into nyc-dev
...
am: 716a9e1892
* commit '716a9e189297beba9e2205a335614e1750b9fdd4':
Support FBE for managed profiles.
2016-02-12 15:07:08 +00:00
Kenny Guy
b1b302660c
Support FBE for managed profiles.
...
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.
Bug: 27038260
Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
2016-02-12 14:29:37 +00:00
Narayan Kamath
36fb3a0e34
Track libcore change 9fbdd1b27de1a3d1005468108.
...
bug: 26689841
Change-Id: I3a0e5d3ab1ada313d73514913990a2aa19ad5b8f
2016-02-12 11:50:04 +00:00
Jae Seo
9b6b98685d
Merge "TIF: Separate service connection errors from recording errors" into nyc-dev am: d0e47d0aef
...
am: 7e878a10b7
* commit '7e878a10b7052d43dd55ef58092ea35285fffde5':
TIF: Separate service connection errors from recording errors
2016-02-12 01:06:20 +00:00
Jae Seo
7e878a10b7
Merge "TIF: Separate service connection errors from recording errors" into nyc-dev
...
am: d0e47d0aef
* commit 'd0e47d0aef55d203fc67df4aa64cfb70b46022ea':
TIF: Separate service connection errors from recording errors
2016-02-12 00:12:08 +00:00
Jae Seo
d0e47d0aef
Merge "TIF: Separate service connection errors from recording errors" into nyc-dev
2016-02-12 00:05:01 +00:00
Jae Seo
25c9c5edab
TIF: Separate service connection errors from recording errors
...
Also clarify the expected behaviors when an error has occurred in a
recording session.
Bug: 27110861
Change-Id: I811197e45ea94b1b0e151d534a1f030a84b89d10
2016-02-11 15:44:55 -08:00
Dianne Hackborn
b39ee5ed8e
Merge "Implement transient extras for jobs."
2016-02-11 20:54:53 +00:00
Lifu Tang
09d02c72f8
Merge "Optimized the memory consumption and renamed PRN" into nyc-dev
...
am: ade2f66fd8
* commit 'ade2f66fd8ff8780f580d3e135b2b9b892adc3e6':
Optimized the memory consumption and renamed PRN
2016-02-11 20:14:15 +00:00
Lifu Tang
ade2f66fd8
Merge "Optimized the memory consumption and renamed PRN" into nyc-dev
2016-02-11 20:10:11 +00:00
Lifu Tang
120480f17a
Optimized the memory consumption and renamed PRN
...
Bug: 27058251
Change-Id: I2309943b1a4e7565868ed0f247b84edc631fbd59
2016-02-11 11:29:40 -08:00
Dianne Hackborn
ba60473a65
Implement transient extras for jobs.
...
You can now associate an arbitrary Bundle of extras with a job,
as long as the job is not persisted.
Also implement deep-copy of Bundle.
Change-Id: I7890d627492b664d9b1f039e8cb82f8868de7be3
2016-02-11 11:28:48 -08:00
Przemyslaw Szczepaniak
d9ef8520d8
Hide java.security.Signatue#getCurrentSpi
...
Internal implementation detail, shouldn't
be public.
Bug: 26689841
Change-Id: If4937ddb3bab1462205933876b1ca46598d14764
(cherry picked from commit 4e559bcbf3 )
2016-02-11 17:26:48 +00:00
Przemyslaw Szczepaniak
237f3ef21c
Merge "Remove java.nio.channels.* classes without test coverage." into nyc-dev
2016-02-11 17:10:56 +00:00
Jeremy Joslin
10cca0dc7f
Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev am: 3d4acbf5fb
...
am: 5c55babd64
* commit '5c55babd64d0ba3bbed77739587594e22bfa3b52':
New systemapi to mark a wifi network as metered.
2016-02-11 17:05:27 +00:00
Jeremy Joslin
5c55babd64
Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev
...
am: 3d4acbf5fb
* commit '3d4acbf5fbe74133b70b0bec51a387428f251ac1':
New systemapi to mark a wifi network as metered.
2016-02-11 15:59:36 +00:00
Przemyslaw Szczepaniak
a2cbdfb33c
Remove java.nio.channels.* classes without test coverage.
...
Removed classes come from openJdk 1.7 and were never
implemented before. We lack a testing suite to verify that
they are working correctly. Those clasess might by
re-added in further releases
Bug: 27117463
Change-Id: Ia7554a9182507b9fa1c1b6db9573ab68cb641f36
(cherry picked from commit 5fbc42d6a2 )
2016-02-11 15:44:34 +00:00
Przemyslaw Szczepaniak
f91fd635a4
Update api/text-current.txt for removed classes.
...
Follow up for c343177bba ,
forgot to update api/text-current.txt
Bug: 27117463
Change-Id: I4d3f26f60f880f9219f726b6ba7dffff9ebeae38
(cherry picked from commit c27649f25e )
2016-02-11 14:57:11 +00:00
Przemyslaw Szczepaniak
60e955beb7
Merge "Hide java.security.Signatue#getCurrentSpi"
...
am: 2c97ab6ee0
* commit '2c97ab6ee0ad469f1292f4fa13249c94fb7a544c':
Hide java.security.Signatue#getCurrentSpi
2016-02-11 13:36:27 +00:00
Przemyslaw Szczepaniak
2c97ab6ee0
Merge "Hide java.security.Signatue#getCurrentSpi"
2016-02-11 13:27:47 +00:00
Przemyslaw Szczepaniak
b1d6d8d234
Hide java.security.Signatue#getCurrentSpi
...
Internal implementation detail, shouldn't
be public.
Bug: 26689841
Change-Id: Ie0b7f9fc2659cb21f58f59c17df52c83e025a87c
2016-02-11 11:56:21 +00:00
Przemyslaw Szczepaniak
00a6750d37
Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev
2016-02-11 10:23:39 +00:00
Przemyslaw Szczepaniak
8d4242c85d
SocketImpl#getFileDescriptor shouldn't be public
...
It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.
Bug: 26689841
Change-Id: I18f53356a108c1f7e0525c6f2f8130eac173e81e
(cherry picked from commit ce41c4ee22 )
2016-02-11 10:18:48 +00:00
Przemyslaw Szczepaniak
ccc7f4e7f8
Merge "Remove java.nio.channels.* classes without test coverage."
...
am: 29fa8967e2
* commit '29fa8967e2ee0c4df560e6d1d630c506dcae4263':
Remove java.nio.channels.* classes without test coverage.
2016-02-11 10:15:38 +00:00
Przemyslaw Szczepaniak
c343177bba
Remove public InetAddress#getAddressInternal()
...
This method shouldn't be public + can be replaced by
the #getAddress method
Bug: 26689841
Change-Id: Ic0f9e0b03979d141c5648772ad94ba2c651ba6e7
(cherry picked from commit 1f3148c27d )
2016-02-11 10:15:00 +00:00
Przemyslaw Szczepaniak
29fa8967e2
Merge "Remove java.nio.channels.* classes without test coverage."
2016-02-11 10:06:55 +00:00
Jae Seo
eb767d0203
Merge "TIF: Add Active Format Description to TvTrackInfo" into nyc-dev
...
am: bfed18aa3c
* commit 'bfed18aa3ce7be44956f08344d183c5fdd9864b6':
TIF: Add Active Format Description to TvTrackInfo
2016-02-11 02:28:35 +00:00
Jae Seo
bfed18aa3c
Merge "TIF: Add Active Format Description to TvTrackInfo" into nyc-dev
2016-02-11 02:22:39 +00:00
Jeremy Joslin
7a598d3d80
New systemapi to mark a wifi network as metered.
...
The implementation will come after the wifi code base has stablized.
BUG:27120794
Change-Id: I6a8140dae45dcd7ec70ac0c51b9513b907a41b63
2016-02-10 17:20:22 -08:00
Jeff Davidson
7dde89d09f
Merge "Expose APIs to analyze UIDs in UserHandle/Process." into nyc-dev
...
am: 7f036f8bce
* commit '7f036f8bce5c2f70b2cbc5e252220909bba69b5d':
Expose APIs to analyze UIDs in UserHandle/Process.
2016-02-11 00:56:42 +00:00
Jeff Davidson
7f036f8bce
Merge "Expose APIs to analyze UIDs in UserHandle/Process." into nyc-dev
2016-02-11 00:52:02 +00:00
Jeff Davidson
48aa86bd0b
Expose APIs to analyze UIDs in UserHandle/Process.
...
Clients of the NetworkStatsManager public APIs may get UIDs belonging
to other users, and UIDs which don't actually represent applications.
These APIs allow clients to understand whether a given ID belongs to
the same user as themselves, and whether an ID represents an
application or something else (e.g. a system UID).
Change-Id: Ia56d5891521ce98e5594c41da8f9d756819deb66
2016-02-10 15:20:33 -08:00
Jae Seo
a2a0c735ff
TIF: Add Active Format Description to TvTrackInfo
...
Bug: 21277083
Change-Id: Ided4ffcd2816e7bb11a81ef10f3b6e1499c6e89b
2016-02-10 14:03:18 -08:00
Youngsang Cho
0dc2d0c558
TIF: Add INPUT_ID field in RecordedProgram
...
am: 4ecf78116e
* commit '4ecf78116e37f5460403f01d0d1e7c583393ee94':
TIF: Add INPUT_ID field in RecordedProgram
2016-02-10 21:34:25 +00:00
Youngsang Cho
4ecf78116e
TIF: Add INPUT_ID field in RecordedProgram
...
INPUT_ID can be retrieved from CHANNEL_ID. But, even if the channel
is removed, recording should be playable. So INPUT_ID is needed.
Change-Id: I7042a19758ce71e77ca2ae7613015e4d22f0d41f
2016-02-10 21:16:22 +00:00
Jae Seo
e4c4306537
Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev
...
am: 425c8bf292
* commit '425c8bf2924f36a8f482d0c4786b7647b5e593d0':
TIF: Rename connect()/disconnect() and remove unnecessary methods
2016-02-10 18:31:56 +00:00
Jae Seo
425c8bf292
Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev
2016-02-10 18:27:06 +00:00
Przemyslaw Szczepaniak
5fbc42d6a2
Remove java.nio.channels.* classes without test coverage.
...
Removed classes come from openJdk 1.7 and were never
implemented before. We lack a testing suite to verify that
they are working correctly. Those clasess might by
re-added in further releases
Bug: 27117463
Change-Id: Ia7554a9182507b9fa1c1b6db9573ab68cb641f36
2016-02-10 15:16:39 +00:00
Julia Reynolds
9ad07f5c6e
Merge "Allow apps to know what users think of their notifications." into nyc-dev
...
am: 146d931ece
* commit '146d931ece7fc273311c049067742bab40a9999a':
Allow apps to know what users think of their notifications.
2016-02-10 14:14:44 +00:00
Julia Reynolds
146d931ece
Merge "Allow apps to know what users think of their notifications." into nyc-dev
2016-02-10 14:10:24 +00:00
Jae Seo
e3c11e8429
TIF: Rename connect()/disconnect() and remove unnecessary methods
...
Bug: 26969670
Change-Id: Iee7d1af2eecc11bb28a8d9d7e377b4754a37095c
2016-02-09 19:18:29 -08:00
Kenny Root
f306294cf5
Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev-plus-aosp
2016-02-09 23:37:36 +00:00
Przemyslaw Szczepaniak
05122b6d6b
SocketImpl#getFileDescriptor shouldn't be public
...
It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.
(cherry picked from commit ce41c4ee22 )
Bug: 26689841
Change-Id: I18f53356a108c1f7e0525c6f2f8130eac173e81e
2016-02-09 23:27:03 +00:00
Przemyslaw Szczepaniak
3f5bf60557
Remove public InetAddress#getAddressInternal()
...
This method shouldn't be public + can be replaced by
the #getAddress method
(cherry picked from commit 1f3148c27d )
Bug: 26689841
Change-Id: Ic0f9e0b03979d141c5648772ad94ba2c651ba6e7
2016-02-09 23:26:00 +00:00
Shawn Willden
14db164e0c
Merge "Add attestation API to Android KeyStore." into nyc-dev
...
am: ea46bb2cbf
* commit 'ea46bb2cbfa301ea3d5c38968636c1c1435ad47d':
Add attestation API to Android KeyStore.
2016-02-09 23:14:47 +00:00
Shawn Willden
ea46bb2cbf
Merge "Add attestation API to Android KeyStore." into nyc-dev
2016-02-09 22:57:24 +00:00