Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,150 Commits 3 Branches 0 Tags
df72e80b03768e94de0d46baea98e6eebd3d4e8d
Commit Graph

235150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
2acd2312c4 resolve merge conflicts of b242549166 to nyc-dev am: 0f6ae2ec0d 
am: aefa80254f

* commit 'aefa80254fa09f0040ba19c27e1752756c2081e1':
  Give bluetooth sufficient capabilities to run DhcpClient
 2016-02-22 07:19:43 +00:00
Erik Kline
aefa80254f resolve merge conflicts of b242549166 to nyc-dev 
am: 0f6ae2ec0d

* commit '0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa':
  Give bluetooth sufficient capabilities to run DhcpClient
 2016-02-22 07:16:01 +00:00
Erik Kline
0f6ae2ec0d resolve merge conflicts of b242549166 to nyc-dev 
Change-Id: I42d4cac95a209fdfae5769d75d90f004a94d60a4
 2016-02-22 15:42:07 +09:00
Erik Kline
c3b52bc466 Delete all NetworkUtils DHCP-related code. 
Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
 2016-02-22 15:14:31 +09:00
Erik Kline
b242549166 Give bluetooth sufficient capabilities to run DhcpClient 
Specifically:
    CAP_NET_RAW
    CAP_NET_BIND_SERVICE

Bug: 26991160
Change-Id: I2afddc9efa3b613d974afb0ea33703948203d99a
 2016-02-22 15:14:31 +09:00
Erik Kline
d365999790 Add WaitForProvisioningCallback am: 111d55658b am: 13daed9fea 
am: 3697ed1fcd

* commit '3697ed1fcd441f712f19a291a99a9533558bad92':
  Add WaitForProvisioningCallback
 2016-02-22 04:36:30 +00:00
Erik Kline
3697ed1fcd Add WaitForProvisioningCallback am: 111d55658b 
am: 13daed9fea

* commit '13daed9fea65c45a7aaeff7224833a87a676a1b4':
  Add WaitForProvisioningCallback
 2016-02-22 04:33:10 +00:00
Erik Kline
13daed9fea Add WaitForProvisioningCallback 
am: 111d55658b

* commit '111d55658bce1bcc3eb61b4aeaa4d8a256165b02':
  Add WaitForProvisioningCallback
 2016-02-22 04:29:37 +00:00
Erik Kline
e4590d4f9f Support setting TCP buffer sizes and HTTP Proxy config am: d0e843b8ef am: 69ce6a0fc5 
am: 5d7293cca8

* commit '5d7293cca8b0b162a2eb293cc739d7aaa62ff85c':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:18:31 +00:00
Erik Kline
5d7293cca8 Support setting TCP buffer sizes and HTTP Proxy config am: d0e843b8ef 
am: 69ce6a0fc5

* commit '69ce6a0fc5fe7f4b7e0dfd929cc4f718354e9d6b':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:14:49 +00:00
Erik Kline
69ce6a0fc5 Support setting TCP buffer sizes and HTTP Proxy config 
am: d0e843b8ef

* commit 'd0e843b8ef4218ba8f69a8a53b3eeaf21e667deb':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:11:28 +00:00
Erik Kline
111d55658b Add WaitForProvisioningCallback 
This centralizes code that is shared by both bluetooth and ethernet
transport layers.

Bug: 26991160
Change-Id: I8e2dd8580c29c86394119768e3a5529850b4b859
 2016-02-22 13:02:02 +09:00
Erik Kline
d0e843b8ef Support setting TCP buffer sizes and HTTP Proxy config 
This allows IpManager to send callback recipients a more satisfying
LinkProperties.

Bug: 26991160
Change-Id: I2eb60dc633e5be38dad9410a1096d0095ddf57a0
 2016-02-22 12:50:44 +09:00
Donghyun Cho
53df72c2d2 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9 
am: e53db46568

* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
  MediaSession: Add new methods for preparing media content
 2016-02-22 03:46:43 +00:00
Donghyun Cho
e53db46568 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 
am: f3db5743b9

* commit 'f3db5743b91e4b90c81a58c41670cca9000dc9e6':
  MediaSession: Add new methods for preparing media content
 2016-02-22 03:42:58 +00:00
Donghyun Cho
f3db5743b9 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 2016-02-22 03:38:55 +00:00
Daichi Hirono
b0aafa5a51 Merge "Update object info when writing a file." into nyc-dev am: 073f5aaec7 
am: bb305c1bab

* commit 'bb305c1bab99306f92e95adefa36e22d92460f6f':
  Update object info when writing a file.
 2016-02-22 03:15:13 +00:00
Daichi Hirono
bb305c1bab Merge "Update object info when writing a file." into nyc-dev 
am: 073f5aaec7

* commit '073f5aaec7256a693dbe09489ddd433ea8267898':
  Update object info when writing a file.
 2016-02-22 03:11:26 +00:00
Daichi Hirono
073f5aaec7 Merge "Update object info when writing a file." into nyc-dev 2016-02-22 03:07:31 +00:00
Wale Ogunwale
6f23958544 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev am: 25410b13a1 
am: b41d1963c4

* commit 'b41d1963c40bd39f7b7a3f4bde3b07c3416ca98e':
  Fixed bug with stack bounds getting out of alignment with screen rotation
 2016-02-21 23:06:07 +00:00
Wale Ogunwale
b41d1963c4 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev 
am: 25410b13a1

* commit '25410b13a1204770f74465176907871aa09fed98':
  Fixed bug with stack bounds getting out of alignment with screen rotation
 2016-02-21 23:03:05 +00:00
Wale Ogunwale
25410b13a1 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev 2016-02-21 22:59:10 +00:00
Wale Ogunwale
ecbcadd27d Fixed bug with stack bounds getting out of alignment with screen rotation 
Before updating the stack bounds due to rotation change, we need to make
sure both the configuration and the current display info. the stack is
using have been updated for the current rotation. Previously we were
updating is after configuration change, but the rotation might have changed
again by the time we get the configuraiton changed call and
TaskSack.updateDisplayInfo not called yet.

Bug: 26744649
Change-Id: Idfd30e78dc9c2fb521ff1957f043c3b1696a2a31
 2016-02-21 14:18:51 -08:00
Jason Monk
7cdea0389f Fix edit/page indicator area layout am: 855d408e17 
am: 353c8ceb04

* commit '353c8ceb042c1b8024fd1177311462c920ea0270':
  Fix edit/page indicator area layout
 2016-02-21 16:12:06 +00:00
Jason Monk
353c8ceb04 Fix edit/page indicator area layout 
am: 855d408e17

* commit '855d408e17612beadfc637496f50b03a7149515a':
  Fix edit/page indicator area layout
 2016-02-21 16:05:41 +00:00
Jason Monk
855d408e17 Fix edit/page indicator area layout 
Bug: 27201532
Change-Id: Ie03e6aeeb9d607f1fba370a4f1bd23a2ffb9b485
 2016-02-21 11:00:49 -05:00
Wale Ogunwale
f0f00c7ecb Apply minimal task dimension to all task bounds change. am: 9a08f827a4 
am: 04f70bd8a0

* commit '04f70bd8a05c478c051f8e8215807223ac8413cf':
  Apply minimal task dimension to all task bounds change.
 2016-02-20 22:48:20 +00:00
Wale Ogunwale
04f70bd8a0 Apply minimal task dimension to all task bounds change. 
am: 9a08f827a4

* commit '9a08f827a4f8ac333402e22e5d45228abe8d98fa':
  Apply minimal task dimension to all task bounds change.
 2016-02-20 22:42:40 +00:00
Wale Ogunwale
9a08f827a4 Apply minimal task dimension to all task bounds change. 
We only used to apply the minimal dimension on resizeTask in
ActivityStackSuperior which is mostly used for freeform and
missed resizes that went through other channels like resizeStack
which is used for split-screen.
We now apply it on TaskRecord.updateOverrideConfiguration which
all task bounds changes go through.

Bug: 27220870
Change-Id: I856948c371f5f5f144e61029ced4a467f7ebe33a
 2016-02-20 14:29:20 -08:00
Svet Ganov
057841000c No overlay when permissions shown - framework am: 9cea80cddd 
am: e552813050

* commit 'e5528130503b554d1e2cc6a711d50857c66a801c':
  No overlay when permissions shown - framework
 2016-02-20 18:45:18 +00:00
Jason Monk
278dafc535 Don\'t set the text on QS Tiles unless we need to am: 7435155432 
am: b619efd771

* commit 'b619efd771bdf3525bc75ab6518af081f2d0a625':
  Don't set the text on QS Tiles unless we need to
 2016-02-20 18:42:09 +00:00
Jason Monk
4317ecb8f0 Merge changes Icb8e2097,I9a2a16f9 into nyc-dev am: 865a4ee0cd 
am: 4472d715c7

* commit '4472d715c7307149e40e30370e57c3ca68beac5e':
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 18:41:03 +00:00
Svet Ganov
e552813050 No overlay when permissions shown - framework 
am: 9cea80cddd

* commit '9cea80cdddbecadb304eb7c8373cf1ed397f433a':
  No overlay when permissions shown - framework
 2016-02-20 18:38:20 +00:00
Jason Monk
b619efd771 Don\'t set the text on QS Tiles unless we need to 
am: 7435155432

* commit '74351554328e56fdd02eb09d93a98aaf97ccce04':
  Don't set the text on QS Tiles unless we need to
 2016-02-20 18:37:12 +00:00
Jason Monk
4472d715c7 Merge changes Icb8e2097,I9a2a16f9 into nyc-dev 
am: 865a4ee0cd

* commit '865a4ee0cddedc8ef11f8370390e197e9ae95067':
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 18:36:05 +00:00
Svet Ganov
9cea80cddd No overlay when permissions shown - framework 
bug:26973205

Change-Id: I88395e47649191bb7db6dd8723c49e741ef4f1e4
 2016-02-20 17:41:47 +00:00
Jason Monk
7435155432 Don't set the text on QS Tiles unless we need to 
Avoid causing layout passes.

Bug: 27278616
Change-Id: I5104a756b44154f6b66f2c74aee17caf29acf628
 2016-02-20 16:56:07 +00:00
Jason Monk
865a4ee0cd Merge changes Icb8e2097,I9a2a16f9 into nyc-dev 
* changes:
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 16:53:04 +00:00
Jason Monk
8d1253e944 Optimization for TouchAnimator 
Bug: 27278616
Change-Id: Icb8e20977a0f8cdbc6ace25707e8f95e34efc356
 2016-02-20 16:51:41 +00:00
Jason Monk
162011ebe8 QS Animations - first pass, still not spec 
Bug: 27201532

Change-Id: I9a2a16f9d769db1f40ae733ad55a07ede4780698
 2016-02-20 08:36:40 -05:00
Jae Seo
ed76f3509d TIF: Add android.permission.READ_TV_LISTINGS 
Bug: 21959866
Change-Id: I6f30289f8660ed8d268bb9138c32d9c6a95bb0b9
 2016-02-20 02:17:39 -08:00
Shreyas Basarge
ed3d4460e9 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b am: 4aa78554df am: 20339172bd am: 20c518816a am: 7f35fa7365 am: 08f781bd82 -s ours am: 0cbfdd3a20 
am: c0a4e6c504

* commit 'c0a4e6c504204455db2c77c0118b61f94495732c':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 08:48:14 +00:00
Jiabin Huang
8983bd4309 Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev am: 079cf52336 
am: 63f2971dee

* commit '63f2971dee821db92d3fbb88d28ada58897cc89f':
  TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
 2016-02-20 08:46:05 +00:00
Lifu Tang
67684c1f32 Merge "Finalized GPS=>GNSS changes with documents" into nyc-dev am: 116229b797 
am: 5675956499

* commit '56759564997fb16da235979bb9ef1c467e5f40e8':
  Finalized GPS=>GNSS changes with documents
 2016-02-20 08:44:11 +00:00
Ian Pedowitz
87c6da54b2 resolve merge conflicts of 2de058fcc9 to master 
Change-Id: Ib6812ad2fc6402b2885ce81de8f7d892c07971e6
 2016-02-20 00:37:16 -08:00
Jorim Jaggi
4c1ceaf163 Merge "Cancel fling animation when starting to drag" into nyc-dev am: f0c548645f 
am: d088074eb4

* commit 'd088074eb4a4a84ce1fb04d4691f6c99b10f16c8':
  Cancel fling animation when starting to drag
 2016-02-20 08:17:46 +00:00
Felipe Leme
7341a00809 Merge "Fixed permissions so Shell can call netpolicy methods." into nyc-dev am: b055c1b51a 
am: cf20a742ed

* commit 'cf20a742ed679861d91bd1e3bf6a9caf5786aedf':
  Fixed permissions so Shell can call netpolicy methods.
 2016-02-20 08:15:41 +00:00
Dianne Hackborn
97b8088c7d Merge "Implement lenient background check option." into nyc-dev am: 9d3a4e1c31 
am: 65938a8305

* commit '65938a83050aafb052abb3583e8e7003354cb0e1':
  Implement lenient background check option.
 2016-02-20 08:14:35 +00:00
Jorim Jaggi
02e6fb72e3 Improve maximizing dock/clip reveal animation am: f97ed9271f 
am: 6ea49d0861

* commit '6ea49d086164ef2dd21b48d14fe40f52ec41e9d8':
  Improve maximizing dock/clip reveal animation
 2016-02-20 08:13:22 +00:00
Ian Pedowitz
41fa9daf78 resolve merge conflicts of 47e693b80c to master 
Change-Id: I4ddb3bdbb5db45d35728137dbf8f5260770a3d08
 2016-02-20 00:04:27 -08:00