Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,375 Commits 3 Branches 0 Tags
8a78cbc1fa996a458759ff51fa8ceec2f2223270
Commit Graph

13313 Commits

Author SHA1 Message Date
Lajos Molnar
4493049a88 Merge "media: unhide codec levels" into nyc-dev 
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: I5a0253e8f8fe65551dadf8b3b024224fedd1042d
 2016-05-24 18:56:32 +00:00
Eric Laurent
50103561d2 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
 2016-05-24 17:33:13 +00:00
Lajos Molnar
6c2e08083a media: unhide codec levels 
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
 2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 2016-05-24 17:15:11 +00:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation 
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
 2016-05-23 17:36:43 -07:00
Adrian Roos
80c470bd52 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
 2016-05-23 23:14:35 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors 
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
 2016-05-23 14:00:07 -07:00
Jean-Michel Trivi
bbcf18dbfd Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
 2016-05-23 20:56:04 +00:00
Jean-Michel Trivi
c991879f29 Merge "Recording activity notification: return list of configuration" into nyc-dev 2016-05-23 20:49:30 +00:00
Chris Wren
ec2e36a485 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev 
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
 2016-05-23 19:01:27 +00:00
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +00:00
Tony Mak
741e0b14cf Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I038ac8c085d5f6590cf8dfa0abc0864da3dd89e2
 2016-05-23 17:23:51 +00:00
Tony Mak
5ee420c0d5 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 2016-05-23 17:17:27 +00:00
Jean-Michel Trivi
f04fab160a Recording activity notification: return list of configuration 
Use a list of configurations instead of an array

Bug 28819230

Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
 2016-05-23 09:44:58 -07:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev 
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
 2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Tony Mak
9ece303402 Remove PROPERTY_WORK_CALL 
Bug: 28842878
Change-Id: I7fb28ec3b121f4546ea60d6b170c2c6d98ffcb8c
 2016-05-20 19:56:08 +00:00
Chris Wren
cf548bfad6 Don't throw RemoteException from new NLS APIs 
Bug: 28820058
Change-Id: If4a290ab7549aa999cee348bf0db85b70cb57553
 2016-05-20 14:53:16 -04:00
Tony Mak
f8c0ddcddf Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I92a8e1e1452ecc80d422c0905a4b86089d24e80b
 2016-05-20 15:46:19 +00:00
Tony Mak
53b5df43b4 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 
TODO: After updating all places that use the SDK, remove/hide the old API

Bug: 28842878

Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
 2016-05-20 15:39:38 +00:00
Ta-wei Yen
ba9b910bbc Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
 2016-05-20 01:07:56 +00:00
Ta-wei Yen
7220c75f65 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
 2016-05-20 01:06:04 +00:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource 
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
 2016-05-19 17:25:41 -07:00
Christopher Tate
3de573733c Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: Iea24b4a97c72248c185f8756b8b74b8b60f3c05f
 2016-05-19 19:38:48 +00:00
Ta-wei Yen
467f067c8c Hide VoicemailContract.setQuota() 
This method is a helper for internal use only.

+ Updated docs for QUOTA_OCCUPIED, QUOTA_TOTAL, and QUOTA_UNAVAILABLE.

Change-Id: Ib146926cd2bff50affe970a0123bcbec62ac3e70
Fixes:28842445
 2016-05-19 12:02:25 -07:00
Christopher Tate
98d609ce3f Incorporate feedback on new wallpaper-related APIs 
- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d
 2016-05-19 10:33:22 -07:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
 2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Christopher Tate
8d71edc83d Add default lock wallpaper capability and API 
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
 2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
 2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39 Add default lock wallpaper capability and API 
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
 2016-05-18 23:57:46 +00:00
Christopher Tate
a9b4f3f628 API feedback: rename JobInfo methods for clarity 
Bug 28773330

Change-Id: I081fa225380a1966010d41020200fb3b9549a195
 2016-05-18 13:59:16 -07:00
Svet Ganov
1129a0f473 Merge "Hide ephemeral API" into nyc-dev 
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
 2016-05-18 20:16:38 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Svet Ganov
2265fddba6 Hide ephemeral API 
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
 2016-05-18 07:38:29 -07:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
 2016-05-18 02:18:38 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Andrii Kulian
06a325c3e3 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
 2016-05-18 00:55:12 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
Joe Onorato
6b10cec210 Merge changes If51568c3,Idd434c19 into nyc-dev 
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
 2016-05-18 00:49:54 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev 
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
 2016-05-18 00:46:47 +00:00
Hangyu Kuang
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
 2016-05-18 00:46:35 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Adrian Roos
3a0f4f4b64 Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
 2016-05-18 00:13:14 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation. 
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
 2016-05-17 16:42:58 -07:00