Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,191 Commits 3 Branches 0 Tags
da4870edaa707ab0c438783b6868fd0c7ec3befe
Commit Graph

64773 Commits

Author SHA1 Message Date
Steve Pomeroy
54bb5dbd65 Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db 
am: 88968cc3ba

* commit '88968cc3baefc453d3564ca1546ae87adbbd1f31':
  Fix documentation bug in SQLiteDatabase

Change-Id: I67d580b53b8fb34ab4c7cbe0bd6dda7e31895e51
 2016-05-12 22:34:02 +00:00
Steve Pomeroy
88968cc3ba Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e 
am: b654fae4db

* commit 'b654fae4dbff8b384ef3074ff762f0ed5b8b1034':
  Fix documentation bug in SQLiteDatabase

Change-Id: I8917758d9d0a41105be1adc596d3468cff22c739
 2016-05-12 22:31:52 +00:00
Steve Pomeroy
d88ca0e659 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 
am: b6c826227d

* commit 'b6c826227dfbc1cdb565098a9df5b897dd1137f3':
  ContentValues: improve documentation

Change-Id: I6a3f730971777a19460f9afeafca1878c4fd522d
 2016-05-12 22:29:25 +00:00
Steve Pomeroy
b654fae4db Merge "Fix documentation bug in SQLiteDatabase" 
am: 21d061ec2e

* commit '21d061ec2e1a097b8759c55e2368ffa6024b6f92':
  Fix documentation bug in SQLiteDatabase

Change-Id: I986c5024e1c4843ec891ffb76f467e42aacb89f6
 2016-05-12 22:29:22 +00:00
Steve Pomeroy
b6c826227d Merge "ContentValues: improve documentation" am: b44d4207c1 
am: 78e5a04902

* commit '78e5a0490278bc12cb7e3c12225aba05639c922f':
  ContentValues: improve documentation

Change-Id: Ifce0816dc5565e6b7944de92ee814f97cb4753b6
 2016-05-12 22:27:12 +00:00
Treehugger Robot
21d061ec2e Merge "Fix documentation bug in SQLiteDatabase" 2016-05-12 22:25:20 +00:00
Steve Pomeroy
78e5a04902 Merge "ContentValues: improve documentation" 
am: b44d4207c1

* commit 'b44d4207c1dc2131e022ddcad74be6d121a51b5e':
  ContentValues: improve documentation

Change-Id: I6c50514fa7b3531da96364d5624e3b093b984007
 2016-05-12 22:24:41 +00:00
Philip Cuadra
d49592805f Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 5fcabe19a7

* commit '5fcabe19a76a06d25358e9889323353f72a94547':
  Pinner service for pinning files into memory

Change-Id: Ia7dc78c32f2beb9c16bf15ac41defc63e51be0e1
 2016-05-12 22:07:43 +00:00
Philip Cuadra
5fcabe19a7 Merge "Pinner service for pinning files into memory" into nyc-dev 
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I404f6844fb5bf4a097d3d862a9294cb58484d176
 2016-05-12 22:04:36 +00:00
Philip Cuadra
0513394f85 Merge "Pinner service for pinning files into memory" into nyc-dev 
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I6dc3f40dbbb5e327976f665de1451eb1d416ee2a
 2016-05-12 22:04:26 +00:00
Philip Cuadra
b41088b4df Merge "Pinner service for pinning files into memory" into nyc-dev 2016-05-12 21:55:29 +00:00
Jesse Hall
61820a6a63 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b 
am: 76766d29b3

* commit '76766d29b33ebb059d36bc20dd2a1c364ebe2eca':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I251ec5b438024e7cb878bab4368881272baeb2fc
 2016-05-12 21:23:51 +00:00
Dimitry Ivanov
76766d29b3 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I406dad31babb52d601e1212c4672f1ce7cd9aa57
 2016-05-12 21:21:25 +00:00
Dimitry Ivanov
69efd6c0c2 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I1adef3e79249cea465a3043c39bccd07dbfe805a
 2016-05-12 21:21:23 +00:00
Steve Pomeroy
1276b5f29e ContentValues: improve documentation 
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
 2016-05-12 21:18:15 +00:00
Steve Pomeroy
8fc3144fa5 Fix documentation bug in SQLiteDatabase 
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045

Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
 2016-05-12 21:16:55 +00:00
Jesse Hall
7f0708390b Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 2016-05-12 21:13:26 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
 2016-05-12 21:01:32 +00:00
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
 2016-05-12 20:58:55 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
 2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Philip Cuadra
7bd0fdd639 Pinner service for pinning files into memory 
Pin key files into memory to prevent having to fetch from flash
after boot.  Improves system performance by preventing page cache
thrash.  Retrieves files from a device-specific overlay to allow
specialization.

bug 28251566

Change-Id: I8532f52bd70271794dd7576976d13a524849ce7b
 2016-05-12 13:12:20 -07:00
Chad Brubaker
1e66b26c41 Merge "Support TrustedCertificateStore.findAllIssuers" 
am: d58e7b2d15

* commit 'd58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
 2016-05-12 19:26:47 +00:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers 
(cherry-picked from commit aa6c3c3e25)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
 2016-05-12 11:15:47 -07:00
Tingting Wang
c8242b22ab Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f 
am: 2fc6bf3936

* commit '2fc6bf3936951764569bef3256bf41823f3986d4':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ib348fbd43a4071156894045e301554ac2631127f
 2016-05-12 17:24:34 +00:00
Tingting Wang
7531057944 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: I93f0b86af829eafa6e8425b360a323c48df67776
 2016-05-12 17:24:20 +00:00
Tingting Wang
2fc6bf3936 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
 2016-05-12 17:16:17 +00:00
Tingting Wang
752129929f Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 2016-05-12 17:11:44 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev 
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
 2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
Alan Viverette
4f440347f5 Merge "Remove extra logging in DatePicker" into nyc-dev am: c952b035b2 
am: a6c89dd6a0

* commit 'a6c89dd6a0bb369392fa04db01ea63a30879b757':
  Remove extra logging in DatePicker

Change-Id: I9c189467f38aa1c3fb0ab911ff4dae8c2c66a645
 2016-05-12 15:05:02 +00:00
Alan Viverette
a6c89dd6a0 Merge "Remove extra logging in DatePicker" into nyc-dev 
am: c952b035b2

* commit 'c952b035b27c858a8d0c794282146f5dd31020e9':
  Remove extra logging in DatePicker

Change-Id: I419291c2c4d4b04e4b508c244b5a5e57c2f57ce5
 2016-05-12 15:02:39 +00:00
Alan Viverette
941bbd4eb7 Merge "Remove extra logging in DatePicker" into nyc-dev 
am: c952b035b2

* commit 'c952b035b27c858a8d0c794282146f5dd31020e9':
  Remove extra logging in DatePicker

Change-Id: I69aa4f977bc8f3d31872f69f735d96188830043e
 2016-05-12 15:02:36 +00:00
Alan Viverette
c952b035b2 Merge "Remove extra logging in DatePicker" into nyc-dev 2016-05-12 14:57:58 +00:00
Chris Wren
621b459306 Merge "document the return type of getImportance" into nyc-dev am: 3041d49d88 
am: 08eb83f8b0

* commit '08eb83f8b0498be7f6361113f672eabefbca689b':
  document the return type of getImportance

Change-Id: I9e8522f5a6df34ad12daa43f4ee1502ac6ffc7b7
 2016-05-12 13:03:18 +00:00
Chris Wren
08eb83f8b0 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I03bb7490b62e749e16a417297a672769283aebdd
 2016-05-12 13:00:50 +00:00
Chris Wren
d328afff96 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
 2016-05-12 13:00:45 +00:00
Chris Wren
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00:00
Dimitry Ivanov
0997908c95 Move Vulkan layer path setup to ApplicationLoaders 
ThreadedRenderer was never the right place for this anyway, and
ApplicationLoaders can provide both the full library search path (not
just the extracted native library dir) as well as the application loader
namespace.

Bug: 28213888
Change-Id: Ibcc0a9178da4dba6f3f3105932fdac1a1d0261af
 2016-05-11 22:59:10 -07:00
Jorim Jaggi
ad94d9ac26 Merge "Fix smallest width configuration calculation" into nyc-dev am: 63c09fd6cd 
am: 3381482586

* commit '33814825861305032d930a95905b67c6120725b5':
  Fix smallest width configuration calculation

Change-Id: I5a380ded44ab27443c67660bb94ce4dcf47e0a17
 2016-05-12 02:04:55 +00:00
Jorim Jaggi
3381482586 Merge "Fix smallest width configuration calculation" into nyc-dev 
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Id753dcb396d31c8bb250581889fb190e396ecf6d
 2016-05-12 01:55:14 +00:00
Jorim Jaggi
1e35919a09 Merge "Fix smallest width configuration calculation" into nyc-dev 
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Iaca06abab9336d15fab5b2ec302a7a821e8f0103
 2016-05-12 01:55:13 +00:00
Jorim Jaggi
63c09fd6cd Merge "Fix smallest width configuration calculation" into nyc-dev 2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3 Fix smallest width configuration calculation 
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.

In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.

Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
 2016-05-11 18:33:01 -07:00
Adam Lesinski
ad3773a154 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev am: 3723194dc8 
am: 04d676b3ae

* commit '04d676b3ae36bca3f3f80b522024121f2238835d':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Id439d6d314805f378bc068144eabd9a16a521f25
 2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: I0b86c2bd861a7de788917c6bae7bccf02dc97b31
 2016-05-12 01:11:21 +00:00
Adam Lesinski
ebfb372876 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
 2016-05-12 01:11:18 +00:00
Dianne Hackborn
398216dc9c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: b3edcd78d2 
am: fc101121f2

* commit 'fc101121f23c292277cb8a54c35c07c4d98de67d':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Ic0d46a17246d9882675c992b81d068be88cd5f74
 2016-05-12 01:00:06 +00:00
Adam Lesinski
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00:00