Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,722 Commits 3 Branches 0 Tags
9a6f0098bad37bc058b392bfcdeeffb09059e800
Commit Graph

13389 Commits

Author SHA1 Message Date
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
 2016-05-23 23:23:40 +00: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
Jean-Michel Trivi
740c0424f0 Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 
am: f2c8fb8620

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

Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82
 2016-05-23 21:06:05 +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
f2c8fb8620 Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

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

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
 2016-05-23 20:55:58 +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
99eed4b5d6 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 
am: ec2e36a485

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

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd
 2016-05-23 19:07:27 +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
Chris Wren
4da0296e23 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: Ibafc3d9adeb046b2b43593285b6f605693b8682e
 2016-05-23 19:01:21 +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
6bd271c7d4 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 
am: 23642330a7

* commit '23642330a7e0732976a0c25ca7d54f59055a92d9':
  Remove PROPERTY_WORK_CALL

Change-Id: If68d597574abb14d0ee06503fe3cd2e351914d52
 2016-05-23 17:32:23 +00:00
Tony Mak
23642330a7 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I17d204d01b2fc356fa6b70d4c5cd73f4b0a10d6c
 2016-05-23 17:26:45 +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
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
 2016-05-23 02:38:19 +00: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
Chad Brubaker
c6a49bb008 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: I470b8e991d590135223066d18b49ff123e0b1f6e
 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
Sanket Padawe
c4a4de836e Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 
am: 096e99e25c

* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
  Add new TelephonyManager api to query Telephony metrics.

Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
 2016-05-20 16:52:40 +00:00
Sanket Padawe
096e99e25c Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 2016-05-20 16:47:05 +00:00
Tony Mak
880f65e852 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4 
am: 2a63190228

* commit '2a6319022861f8c2fce74b5657d78c008b33115a':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: Ifdd53fc5fc836fc07239e5ad2f7ba00b5c8b976a
 2016-05-20 16:05:04 +00:00
Tony Mak
2a63190228 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: I24a866a5947a20127f3b79e2e75ba0cf534b450c
 2016-05-20 16:01:00 +00: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
df858672ba Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 
am: 93ad8c6b2f

* commit '93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
  Hide VoicemailContract.setQuota()

Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
 2016-05-20 01:14:01 +00:00
Ta-wei Yen
f652b1ec42 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f 
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
  Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
 2016-05-20 01:11:34 +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
93ad8c6b2f Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

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

Change-Id: Ifc1365650a981130a376ef253e96331595475510
 2016-05-20 01:07:52 +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
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

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

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
 2016-05-20 01:06:03 +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
2b2ad77fdb Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 
am: 9d37bdcb91

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

Change-Id: I0dce83effbb05d52e2bcfb6f0ff48badbab71655
 2016-05-19 19:44:42 +00:00
Chris Tate
2467a7fe90 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev am: 9d37bdcb91 
am: 3de573733c

* commit '3de573733c05d204589d9c56fb26fbb985ecc060':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I7cbca080286f54040782c79eab57f2285cee222d
 2016-05-19 19:44:15 +00: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
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

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

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00: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
Michael Wright
ce290a75f2 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: I03543851263b7e9e2f84b179d66d3d269c48bf6c
 2016-05-19 15:12:29 +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
c59e70d520 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 
am: 81ce16a2e6

* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
  Rename minWidth/Height attributes

Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
 2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

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

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
 2016-05-19 01:48:29 +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