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

59024 Commits

Author SHA1 Message Date
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
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
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
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00: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
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
Jim Miller
a0a18ea433 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev am: 254d9e4f41 
am: 3c1e640d83

* commit '3c1e640d8312c7cb2ff2e4f0ee374cd167a508bf':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: I672608adaa96a2280479d83c3854911b7307587e
 2016-05-12 00:59:00 +00:00
Dianne Hackborn
fc101121f2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 
am: b3edcd78d2

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

Change-Id: I1eda5e59bdd122dd35a8025b35b63b216ca9e60d
 2016-05-12 00:50:42 +00:00
Dianne Hackborn
b3edcd78d2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:18 +00:00
Jim Miller
3c1e640d83 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev 
am: 254d9e4f41

* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: Iaa814af0752a90ec53eed44b4d31b6bfdc13bfc3
 2016-05-12 00:39:02 +00:00
Jim Miller
254d9e4f41 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev 2016-05-11 23:45:09 +00:00
Yigit Boyar
cac41c969f Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca 
am: c8777a833a

* commit 'c8777a833a165ed5025b18540cc2d25faa6ea744':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I3d58765bcb7264892f0280b37b702e3dbbccdfd4
 2016-05-11 22:48:16 +00:00
Yigit Boyar
c8777a833a Merge changes I6e3f4da2,I8acfbd1a into nyc-dev 
am: 1a97cbd4ca

* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I30a02773e4cfb05e3e6ee224d829b4c380eb00f0
 2016-05-11 22:42:06 +00:00
Yigit Boyar
1a97cbd4ca Merge changes I6e3f4da2,I8acfbd1a into nyc-dev 
* changes:
  Fully detach unused scrap views
  Remove detached headers
 2016-05-11 22:32:05 +00:00
Adam Powell
2106f3e935 Merge "Less lazy child FragmentManager creation" into nyc-dev am: 6437dac3d9 
am: 8dd12a52cc

* commit '8dd12a52cc422bd0f4894cac7d23bcb3cba19037':
  Less lazy child FragmentManager creation

Change-Id: I67296b51104728619a9be0b589fb17e5d25dcd66
 2016-05-11 22:00:25 +00:00
Adam Powell
3b981d026c Merge "Less lazy child FragmentManager creation" into nyc-dev 
am: 6437dac3d9

* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
  Less lazy child FragmentManager creation

Change-Id: Ic5917acbe07f67a577ce693680c132d07519d34a
 2016-05-11 21:41:50 +00:00
Adam Powell
8dd12a52cc Merge "Less lazy child FragmentManager creation" into nyc-dev 
am: 6437dac3d9

* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
  Less lazy child FragmentManager creation

Change-Id: I64e044e21b86f3015ab251780952c5b157b2b1e9
 2016-05-11 21:41:43 +00:00
Adam Powell
6437dac3d9 Merge "Less lazy child FragmentManager creation" into nyc-dev 2016-05-11 21:32:57 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager 
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
 2016-05-11 14:25:55 -07:00
Dianne Hackborn
ef0a402f58 Fix issue #28400000: Settings memory UI still showing z-ram... 
...but probably shouldn't.

Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.

Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
 2016-05-11 14:21:07 -07:00
Alan Viverette
efb8e576a9 Remove extra logging in DatePicker 
Issue seems to be fixed now, don't need the extra logging.

Bug: 27310206
Change-Id: Ibf53d056e9c5144729dae02c72050aebd90e4343
 2016-05-11 17:10:13 -04:00
Adam Powell
467cc6f0e1 Less lazy child FragmentManager creation 
Framework edition

Fix a bug where child FragmentManagers moving too lazily into the
CREATED state and beyond caused child fragments to not be
attached/created when expected.

Bug 25019275

Change-Id: I04ff0d3bcb693178a6ee3057da591392defdbcf8
 2016-05-11 13:45:33 -07:00
Julia Reynolds
35410a4128 Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: b15ecad14c

* commit 'b15ecad14c8eb9fbf00ffb82c6d5dea37dabcc80':
  Do not bundle cross user.

Change-Id: I54f3d8b36617f5a9294d119a76b19cba0b9793b2
 2016-05-11 17:29:42 +00:00
Julia Reynolds
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 2016-05-11 17:27:03 +00:00
Julia Reynolds
47e0d29473 Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
 2016-05-11 17:26:59 +00:00
Julia Reynolds
68a32b5aad Merge "Do not bundle cross user." into nyc-dev 2016-05-11 17:20:16 +00:00
Rob Carr
e23f0f9f0f Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev am: a625b0b597 
am: e49ecf58e9

* commit 'e49ecf58e9d95c3a5cf63654b6d507c141b66982':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I33333147a03cf53d2a3f7768b6246c5bdc3b1dc0
 2016-05-11 16:51:16 +00:00
Robert Carr
e49ecf58e9 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev 
am: a625b0b597

* commit 'a625b0b5976c17d8efabcf348613db7fda3e56cf':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I84b8882069a36c8f625060cb82696660a0c9c681
 2016-05-11 16:48:32 +00:00
Robert Carr
965c343065 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev 
am: a625b0b597

* commit 'a625b0b5976c17d8efabcf348613db7fda3e56cf':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: Ia2bb751cd9864ed10e5ee5d38c7bea4d91527b2e
 2016-05-11 16:48:28 +00:00
Chris Wren
5ab5c748a8 document the return type of getImportance 
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
 2016-05-11 12:44:58 -04:00
Rob Carr
a625b0b597 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev 2016-05-11 16:44:16 +00:00
Julia Reynolds
eae43fbd17 Do not bundle cross user. 
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
 2016-05-11 10:59:53 -04:00
Todd Kennedy
d2ebc5e3ab Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936 
am: fc7701c569

* commit 'fc7701c56923369bb30eae6559dfbc100a174477':
  Fix secondary ABI instrumetion

Change-Id: I88afbda2d0b4f87f03b9806ff6de9a4066bd4dac
 2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569 Merge "Fix secondary ABI instrumetion" into nyc-dev 
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I7a48511c8038725524abd8fc0adbd86e9e9fe09c
 2016-05-11 14:41:44 +00:00
Todd Kennedy
9580593e5d Merge "Fix secondary ABI instrumetion" into nyc-dev 
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I0ad719338b8cbcf9cf90526d2e0196aa25ff07ad
 2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936 Merge "Fix secondary ABI instrumetion" into nyc-dev 2016-05-11 14:35:19 +00:00
Greg Kaiser
bac3e57f3d Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9 
am: 9311165c2c

* commit '9311165c2cbb42fe37a42dc916e303ac180f9f6c':
  GradientColor: Fix typo in documentation.

Change-Id: I590125c62d1e5b73bfe3b0255f69c07daf3d78b9
 2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c Merge "GradientColor: Fix typo in documentation." into nyc-dev 
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I392ac824d733dcbeb2e79d5be4ad1668ad3400cc
 2016-05-11 12:39:38 +00:00
Greg Kaiser
5662120923 Merge "GradientColor: Fix typo in documentation." into nyc-dev 
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I647222141e85163cefe2241a96439f0eb3d7a97a
 2016-05-11 12:39:34 +00:00
Greg Kaiser
a452dd3fd9 Merge "GradientColor: Fix typo in documentation." into nyc-dev 2016-05-11 12:32:18 +00:00
Jim Miller
e4044bb617 Fix KeyguardManager.isSecure() to observe work profile 
The fix passes the calling userId instead of the current userId to
allow apps running as managed profiles to work.

Fixes bug 28666104

Change-Id: I9f8676ab11bd581d9e67b2b9f385036d4d3576ee
 2016-05-10 18:38:25 -07:00