Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,701 Commits 3 Branches 0 Tags
398216dc9cd0946ed61cd1e3015375c4b07e2cf0
Commit Graph

59005 Commits

Author SHA1 Message Date
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
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
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
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
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
Jorim Jaggi
4b4a8323c1 Don\'t stage content drawn bounds am: e85ce990fe 
am: a229226c61

* commit 'a229226c61580f6d70768f3d7dc51c3fb6f00764':
  Don't stage content drawn bounds

Change-Id: If988837b1c743a0f4ec8996bd79c679a973024f6
 2016-05-11 00:47:14 +00:00
Fyodor Kupolov
5a8fb5004c Merge "Push unlocking/unlocked state to UserManager" into nyc-dev am: fdc675968c 
am: 6b366a34ee

* commit '6b366a34eeda68e63ce00621d4ce133786320860':
  Push unlocking/unlocked state to UserManager

Change-Id: I8aadfc85b24159c701fd82ab7d0d403a7def4545
 2016-05-11 00:47:12 +00:00
Jorim Jaggi
a229226c61 Don\'t stage content drawn bounds 
am: e85ce990fe

* commit 'e85ce990fe7bfa33d6b7d8bfd23b7336096466b9':
  Don't stage content drawn bounds

Change-Id: I2e380e1fb43f26b90927c10e2b445049e2fd2966
 2016-05-11 00:44:02 +00:00
Fyodor Kupolov
6b366a34ee Merge "Push unlocking/unlocked state to UserManager" into nyc-dev 
am: fdc675968c

* commit 'fdc675968c818a1913b870dd16077f6fe785ee3f':
  Push unlocking/unlocked state to UserManager

Change-Id: I687b30f32925009b8060ea07d78263672f580e08
 2016-05-11 00:43:59 +00:00
Jorim Jaggi
ff72d0c500 Don\'t stage content drawn bounds 
am: e85ce990fe

* commit 'e85ce990fe7bfa33d6b7d8bfd23b7336096466b9':
  Don't stage content drawn bounds

Change-Id: Iac78a8adfdce673a7294ffa4b746f0beb5fa5876
 2016-05-11 00:43:58 +00:00
Fyodor Kupolov
5a3477d52e Merge "Push unlocking/unlocked state to UserManager" into nyc-dev 
am: fdc675968c

* commit 'fdc675968c818a1913b870dd16077f6fe785ee3f':
  Push unlocking/unlocked state to UserManager

Change-Id: Ice3c4078d4deb85dd1b1eee2924be19f28fb6a85
 2016-05-11 00:43:57 +00:00
Jorim Jaggi
e85ce990fe Don't stage content drawn bounds 
It's certainly not needed for two up, so remove the staging aspect.

Freeform resizing is currently broken because of another bug so this
can't be tested, but because we are not "shipping" it in any case
fixing the 2-up bug is more important, but it shouldn't break freeform
anyways.

Bug: 28618501
Change-Id: I6f285a714281fde50fd7328a3f8999cfa8dfb2c5
 2016-05-11 00:37:33 +00:00
Fyodor Kupolov
fdc675968c Merge "Push unlocking/unlocked state to UserManager" into nyc-dev 2016-05-11 00:27:48 +00:00
Greg Kaiser
2d609eda74 GradientColor: Fix typo in documentation. 
Bug: 28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
 2016-05-10 17:05:31 -07:00
Makoto Onuki
c9289b8053 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev 
am: 4a3b597f55

* commit '4a3b597f557ef900299202ef88a6e601c0629368':
  Refactoring ShortcutManager + bug fixes.

Change-Id: Ief3a0dd2c81a2343895a88d9049b48d19bac6ac1
 2016-05-10 23:07:02 +00:00
Makoto Onuki
4a3b597f55 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev 2016-05-10 23:02:49 +00:00
Amith Yamasani
9165f15e7d Merge "Fix multi-window assiststructure trashing" into nyc-dev am: a66d395490 
am: 0ce0116338

* commit '0ce011633880e90a314cfc286519b89dac66d482':
  Fix multi-window assiststructure trashing

Change-Id: Id1a7b8a2209fc1b62b2814a6fac0b3dacd5c552d
 2016-05-10 22:35:31 +00:00
Amith Yamasani
0ce0116338 Merge "Fix multi-window assiststructure trashing" into nyc-dev 
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: I8bf4366b8e5bf7b0c37a9f81e2d0303b8dfdd22d
 2016-05-10 22:32:53 +00:00
Amith Yamasani
aba30bf7dd Merge "Fix multi-window assiststructure trashing" into nyc-dev 
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: Ief57ac26261e2248441acd3138b63e4b6272fc4a
 2016-05-10 22:32:51 +00:00
Amith Yamasani
a66d395490 Merge "Fix multi-window assiststructure trashing" into nyc-dev 2016-05-10 22:29:20 +00:00
Todd Kennedy
e713efcac1 Fix secondary ABI instrumetion 
When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.

Bug: 28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
 2016-05-10 15:16:13 -07:00
Adam Powell
82e644de2f Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f 
am: 6e90b67dfa

* commit '6e90b67dfaf02c236b542951dfaac3a7d805ef21':
  Move Activity multi-window event logic out of the public methods

Change-Id: I1eb6677d8ecd2208b20c2094eb4d708f6e20bc14
 2016-05-10 21:40:16 +00:00