Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,199 Commits 3 Branches 0 Tags
896fe7aa04fd57447cd22209641ccdb64b05eec8
Commit Graph

43478 Commits

Author SHA1 Message Date
Jeff Sharkey
896fe7aa04 am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'cb1236be15023152535cedfb9ed20a0c8b94ada1':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:36:01 +00:00
Jeff Sharkey
ca5186e9d5 Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 2014-08-28 16:12:47 +00:00
Selim Cinek
f1d8349bb3 am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner 
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
  Added a warning when the profile has an owner
 2014-08-28 13:49:25 +00:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner 
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
 2014-08-28 15:09:28 +02:00
Esteban Talavera
20b41f85f0 am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'da3a898110b91fb913e539e38b68233d12bf54ca':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 10:49:21 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00
Jae Seo
41b12ff46b am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit 'edf8161ea45f134b0732634aac8afa7836f1bab1':
  Add android.software.live_tv feature
 2014-08-28 06:07:54 +00:00
Jae Seo
11cfe2c036 Merge "Add android.software.live_tv feature" into lmp-dev 2014-08-28 05:50:19 +00:00
Selim Gurun
9342a657d9 am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '405c03aded694e85ee278f650a19988a8c17f8c4':
  Address API Feedback
 2014-08-28 03:39:27 +00:00
John Reck
59f71093fe am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
  Animator stuff
 2014-08-28 03:39:21 +00:00
Svetoslav
eebff5a5a1 am 84805a00: am b4bd1427: Merge "Fix live region updates." into lmp-dev 
* commit '84805a00a3ed0234948b76274c93a60f36e96e00':
  Fix live region updates.
 2014-08-28 03:39:16 +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
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
Svetoslav
040a7f0526 Merge "Fix live region updates." into lmp-dev 2014-08-28 01:37:43 +00:00
Selim Gurun
17d1adb183 Address API Feedback 
Bug: 17253647

This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.

Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
 2014-08-27 17:56:08 -07:00
John Reck
119907cd25 Animator stuff 
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
 2014-08-27 17:44:25 -07: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
Jeff Sharkey
5b836f29a3 Define EXTRA_SIZE for ContentProviders. 
Also make Size and SizeF parcelable.

Bug: 17205016
Change-Id: Ide397b84864f6cad7f8d89e66b6c8697a3ad335b
 2014-08-27 15:13:57 -07: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
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
Jae Seo
cfd861ec15 Add android.software.live_tv feature 
This feature will be listed by Android TV devices that allow displaying
contents from TV inputs implemented with the
android.media.tv.TvInputService API. (Note that not all leanback devices
support this feature.)

Bug: 17284986
Change-Id: Ic1f23f6f5955866e9f1db9229693d370576066a3
 2014-08-27 14:02:15 -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
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
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
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
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
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