Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,756 Commits 3 Branches 0 Tags
af74216c4e6f9b8ec7973203016a613153e69e16
Commit Graph

40506 Commits

Author SHA1 Message Date
Yorke Lee
af74216c4e am 64c86ede: am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '64c86edeb93c8b7dcde4c2a6288414e3ab416055':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 04:17:16 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 04:17:06 +00:00
Filip Gruszczynski
4185f1620f am 7657388c: am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '7657388c235e87c622bf821a8a48b5566db70a51':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 04:16:55 +00:00
Yorke Lee
1238a8e7d3 am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '9aedb262a98532e30658c00e5acff33c1b7c32a9':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 03:38:18 +00:00
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 03:38:00 +00:00
Filip Gruszczynski
bbc0f67195 am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '2a81e91f63c14ddf04c82a124096553c36924344':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 03:37:54 +00:00
Yorke Lee
fe7c3bc082 Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 2014-08-28 00:16:27 +00:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER 
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
 2014-08-27 16:28:12 -07:00
Filip Gruszczynski
30a480bcfc Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 2014-08-27 23:22:29 +00:00
Filip Gruszczynski
f14d924cd7 Allowing isRound and outsetBottom properties to be passed to ActivityView. 
We remove requirement for having display id == 0 or allow circumventing it
through a flag.

Change-Id: Ia4671614b51894393d47e681cc72718d394230f6
 2014-08-27 15:38:24 -07:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY 
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
 2014-08-27 15:37:27 -07:00
Jim Miller
db72969e93 am 9c9d3c42: am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit '9c9d3c4257c1cbd4a7831b28378ff368566bb081':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 22:06:22 +00:00
Jim Miller
21219ffcce am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit '694a6bbcc6c49a76fae440fdadab16879556c7bf':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:52:59 +00:00
Jim Miller
6979cd1e4d am 58c53113: am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '58c53113c4fb2cc13ac3e8f37d73fc0dad9b5799':
  Change name of confirm credentials method after API review
 2014-08-27 21:51:36 +00:00
Eino-Ville Talvala
33bf20f3ef am 0d09fda1: am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '0d09fda101e557f2e8894746d14f8a190f2a1af0':
  Camera2: Correct error handling
 2014-08-27 21:51:05 +00:00
Jim Miller
bb22e2a7a4 am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '56c0e1db523779ee7856ac196b7370b7433142b3':
  Change name of confirm credentials method after API review
 2014-08-27 21:36:53 +00:00
Eino-Ville Talvala
bf8a6d77b0 am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '4046697e3a6b409e8bcd76a06b3d457814c8f444':
  Camera2: Correct error handling
 2014-08-27 21:35:42 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Julia Reynolds
f1e13ba1a2 am f7f6b67d: am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'f7f6b67dfc68404e9b18e944ff0ef8ae2c0465b0':
  Limit the settings profile/device owners can update.
 2014-08-27 17:28:28 +00:00
Makoto Onuki
63d3e8fe01 am a3ed4ae9: am 1a8674f1: am d37368bf: Address API review comments: 
* commit 'a3ed4ae9578a49981e40746614940de1b54ccf25':
  Address API review comments:
 2014-08-27 17:14:24 +00:00
Julia Reynolds
cf24b10343 am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit '68ddd6d92d3b09b4f6ecdb9621b7997414d501e2':
  Limit the settings profile/device owners can update.
 2014-08-27 17:13:04 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
 2014-08-27 17:05:48 +00:00
Makoto Onuki
42f8a09c81 am 1a8674f1: am d37368bf: Address API review comments: 
* commit '1a8674f1025336fb6ae1bc28a70fcdfd597a6f15':
  Address API review comments:
 2014-08-27 16:53:14 +00:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00
Sander Alewijnse
c3b7c6693b am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '45fb047dab5a96a9ec72c6cf6aa168f80b115d5c':
  Provide lockdown of date/time device owners.
 2014-08-27 14:43:10 +00:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
Russell Brenner
b95cef8ac0 am c9c663d3: am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c9c663d31884f85bbe14a1505051836288b517fb':
  Print services setting changes not handled for managed profiles.
 2014-08-27 09:48:19 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +00:00
Russell Brenner
ac7334d4fd am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c04b259aa962616089994c8cf225ff396feb1c83':
  Print services setting changes not handled for managed profiles.
 2014-08-27 06:32:14 +00:00
Dianne Hackborn
940434def1 am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit 'eb7a0e4e9bcb6a18655c4f349c90216011406d75':
  Fix issue #17146552: system anr
 2014-08-27 06:20:11 +00:00
Svetoslav
948397a453 Merge "Print services setting changes not handled for managed profiles." into lmp-dev 2014-08-27 06:13:23 +00:00
Dianne Hackborn
5232271a41 Fix issue #17146552: system anr 
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
 2014-08-26 22:55:47 -07:00
Jim Miller
d262f6941f am b4a5c851: am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b4a5c8511288c1a4e234120bbb3b32d0980c47e3':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 05:00:45 +00:00
Adam Powell
c55fd9e225 am 3f9989e0: am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit '3f9989e0e7fa5ce8a425bb95d1957126e2630459':
  Adjust toolbar/action bar title handling
 2014-08-27 05:00:30 +00:00
Dianne Hackborn
3cc8dbb87e am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'bad701ee645948d92982bad90e4d4cfc868e6816':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 04:53:23 +00:00
Jim Miller
bdc2da026f am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b0400d12f8f2dd4ad8088fef9c13dcf37bcb9837':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 04:46:25 +00:00
Adam Powell
a80c4a2296 am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit 'f692592004f011759d9a79824c156b51ab10da13':
  Adjust toolbar/action bar title handling
 2014-08-27 04:46:11 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:33:58 +00:00
Yorke Lee
2822d16b02 am 14407ed0: am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '14407ed0cc8d23c4bbf6609611d522c0986894c1':
  API changes for ContactsContract
 2014-08-27 04:33:54 +00:00
Dianne Hackborn
80e29b66c5 Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 2014-08-27 04:31:26 +00:00
Dianne Hackborn
852975d537 Fix issue #17179314: Make recents limits consistent 
The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.

Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.

With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.

Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
 2014-08-26 21:24:42 -07:00
Christopher Tate
584cce1ce9 am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '663c889c750023e6c7109a57f33034a96432fd35':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:20:12 +00:00
Yorke Lee
84496c7706 am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit 'cca607410716197803663676526cf6368c58a7de':
  API changes for ContactsContract
 2014-08-27 04:20:06 +00:00