Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,405 Commits 3 Branches 0 Tags
571663bfd6bb0aeda6bf7689ce2ac80be4aca265
Commit Graph

29984 Commits

Author SHA1 Message Date
Xiaohui Chen
f86676ad6d Change framework services tests' runner 
Change the test runner to android.support.test.runner.AndroidJUnitRunner
This newer runner support Mockito tests. See b/8138651
This should at least fix RankingHelperTest here.

Change-Id: I68e4f33939478e1ea59a3860d5ded1cd22a47989
 2015-08-19 21:32:36 +00:00
Lorenzo Colitti
e0938bed96 am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:23:03 +00:00
Filip Gruszczynski
6c8b36f767 Merge "Improve animating from recents to multi window state." 2015-08-19 21:21:03 +00:00
Lorenzo Colitti
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Lorenzo Colitti
0257c82fa1 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:54:48 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Amith Yamasani
50b1bd2485 am a79f37c3: am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'a79f37c31fb0605465d1d6a1ccfdbf9b821fcd96':
  Fix crashes when removing work profile
 2015-08-19 20:48:30 +00:00
Amith Yamasani
a79f37c31f am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit '6e6fbc932ac5355bc90cc1f98b38d46281b1aeaf':
  Fix crashes when removing work profile
 2015-08-19 20:40:52 +00:00
Amith Yamasani
7102fb5f52 am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e1df482c173d975923dba2d3cf644f5a0fadee17':
  Fix crashes when removing work profile
 2015-08-19 20:25:26 +00:00
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
 2015-08-19 20:19:28 +00:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Filip Gruszczynski
170192ab55 Improve animating from recents to multi window state. 
Previously all windows would start animating from a single thumbnail
that was clicked. Now each animates from its thumbnail, including
properly animating the thumbnail header. This involves System UI
providing information about the thumbnail setup and app transition code
using it to setup each individual animation.

Change-Id: I6f45c94af6bcbf6898b8ed757d83505af99ed6b1
 2015-08-19 12:20:46 -07:00
Dianne Hackborn
e264f9a51e am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5a1234fabf73224d107ce0715682728b35357203':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 19:01:16 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:39:56 +00:00
Xiaohui Chen
98404fdc0b Clean up USER_OWNER reference. 
Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
 2015-08-19 18:34:46 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Xiaohui Chen
594f208d66 Clean up USER_OWNER reference in pm/Settings 
Bug: 19913735
Change-Id: I538ed443b945e9cbb731520450bf5ef39882ae37
 2015-08-19 17:34:15 +00:00
Chong Zhang
530ea0dfb5 Merge "Initialize visible to false to reflect the real visibility state" 2015-08-19 17:03:14 +00:00
Zhentao Sun
24b7f0fb47 am 00447eeb: am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '00447eeb99d93b135bd5ef4f7c1f6ca90000e6f7':
  Launched camera in the correct user.
 2015-08-19 16:35:49 +00:00
Zhentao Sun
00447eeb99 am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '4caf6b9784d0102844f74ea65da75affc0750896':
  Launched camera in the correct user.
 2015-08-19 16:30:05 +00:00
Zhentao Sun
880ef585ab am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit 'f2f0114848e5fb729bf5943a70142520f66daa4c':
  Launched camera in the correct user.
 2015-08-19 16:18:06 +00:00
Zhentao Sun
f2f0114848 Merge "Launched camera in the correct user." into mnc-dr-dev 2015-08-19 16:12:25 +00:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps 
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
 2015-08-19 11:08:38 -04:00
Ben Kwa
0fad22712c Merge "Fix XML early-outs." 2015-08-19 13:59:48 +00:00
Chong Zhang
a48ef66a46 Initialize visible to false to reflect the real visibility state 
So that ensureActivitiesVisibleLocked() doesn't skip the set visible
code for other apps in freeform stack.

bug: 22984782
Change-Id: Icbad7677f23ce788729c084e72d8757d5ae41188
 2015-08-18 19:28:08 -07:00
Adam Lesinski
90c68f2a24 am 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '3170650a2b611f175e401634436c650a56d957e9':
  Change default cellular activity timeout to 10
 2015-08-19 02:22:12 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 02:21:58 +00:00
Jim Miller
10fe83a9b9 am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev 
* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
  Revert "Disable fingerprint when remotely reset by DPM"
 2015-08-19 02:21:46 +00:00
Tim Kilbourn
4080a4197c am 6041a68b: am 458d4d6d: am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev 
* commit '6041a68babcc0ec9cc2009fcfe75848882661785':
  Use init to write usb typec props.
 2015-08-19 02:21:39 +00:00
Dianne Hackborn
35eb8d6205 am 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit '1559f1c5a0a4db23b8338b8c4792dcb351c541f8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-19 02:21:23 +00:00
Adam Lesinski
3170650a2b am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '56df15d3b41e6599e174da92352d85d11f9155ee':
  Change default cellular activity timeout to 10
 2015-08-19 01:43:25 +00:00
Jim Miller
849b9e58d6 am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 01:43:12 +00:00
Jim Miller
8978d9acba am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev 
* commit '309fef16e1494c80a54cbd0a59a98f32c512f845':
  Revert "Disable fingerprint when remotely reset by DPM"
 2015-08-19 01:43:02 +00:00
Tim Kilbourn
6041a68bab am 458d4d6d: am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev 
* commit '458d4d6d7fa8d4e76674a32c240bdbd7701a86dc':
  Use init to write usb typec props.
 2015-08-19 01:42:57 +00:00
Dianne Hackborn
1559f1c5a0 am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit '217d45685f176c7a2584b32a484c644f9f921265':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-19 01:42:45 +00:00
Adam Lesinski
5b3a38e07d am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03':
  Change default cellular activity timeout to 10
 2015-08-19 00:59:10 +00:00
Adam Lesinski
bda9b324c8 am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10
 2015-08-19 00:53:35 +00:00
Yusuke Sato
10a2999a46 Merge "Trace scanDirLI()" 2015-08-19 00:51:15 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats 
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
 2015-08-18 17:33:00 -07:00
Yusuke Sato
8324a6ee83 Trace scanDirLI() 
Change-Id: I3761b4991d45684e9b712c5870bcacd08dc806de
 2015-08-18 17:24:14 -07:00
Zhentao Sun
4354a05f85 Launched camera in the correct user. 
Fixed b/23325974.
The camera was always launched in the device owner's profile. Now it can
work with secondary users.

Change-Id: I826b341a7e73a9dd603dd5df7aa31bfaf4d440c4
 2015-08-18 17:05:37 -07:00
Chong Zhang
aa1fd4e6d3 Merge "Restore recent task to freeform space when resizing" 2015-08-18 23:55:07 +00:00
Amith Yamasani
236b2b5d28 Fix crashes when removing work profile 
This isn't specific to work profile. When multiple user
deletions happen in sequence, a race causes a dying user
to lose permissions prematurely. This fix delays removal of
user state until the user is completely cleaned up and all the
processes have been killed.

Bug: 23178833
Change-Id: I1636bc2022416359a25f19a3f65d113c05289cd3
 2015-08-18 16:48:55 -07:00
Jim Miller
7ef772713f am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-18 23:18:36 +00:00
Jim Miller
bea9d7b94c Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 2015-08-18 23:12:18 +00:00
Chong Zhang
5dcb275cc1 Restore recent task to freeform space when resizing 
bug: 22984782
Change-Id: I95b7b7b4871865102a279e529f068479e9b5df34
 2015-08-18 15:28:54 -07:00
Wale Ogunwale
339e4155fb Merge "Added support for docked stack" 2015-08-18 21:23:46 +00:00
Adam Lesinski
886e7a63b1 Merge "Change default cellular activity timeout to 10" into mnc-dev 2015-08-18 20:43:34 +00:00