drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,183 Commits 1 Branch 0 Tags
Commit Graph

8364 Commits

Author SHA1 Message Date
Svetoslav
39999cf026 Allow adding widgets from user profiles. 
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

(cherrypicked 8cd27c3c to work around Gerrit issue)

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
 2014-08-06 11:01:36 +01:00
Chris Craik
0bd972295c am b7cded34: am cfaffb15: am 1a922899: Make outline alpha APIs public 
* commit 'b7cded34efe8d8bf8e7a94bb336dbf640e658128':
  Make outline alpha APIs public
 2014-08-04 23:41:05 +00:00
Chris Craik
13ed2178c4 Make outline alpha APIs public 
bug:16140822
Change-Id: Ie21e2a75b462319fb49c5696f0c019e1ea803bc1
 2014-08-04 23:28:34 +00:00
Tom Taylor
2cd2bb9e43 am fb79ed97: am 9b7596e1: am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit 'fb79ed970485fa5d870adc0bf58b1e47fbfed60b':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:31:45 +00:00
Tom Taylor
0e32f6bde4 Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 2014-08-01 13:51:29 +00:00
Ye Wen
63c00c4379 Allow MmsConfig override per request (1/3) 
Instead of providing ways to override MmsConfig globally, this allows
the override per request, which is safer. Also added subId to the getter
of MessagingConfigurationManager.

b/16681649

Change-Id: Ia5ee391e2fa51fbdf87d111174d8df21f5f5e41f
 2014-08-01 13:57:31 -07:00
Sandeep Siddhartha
73d991e258 am 118b91bf: am 01d13015: am 966134c7: Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev 
* commit '118b91bf8e37dfe48551be72790680690eb0a40d':
  Add a flag for multiple triggers with same recognition session
 2014-08-02 01:41:38 +00:00
Wei Wang
b8c6c2f56a am 06e7b060: am b89e6747: am 8508d7ff: Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev 
* commit '06e7b0604d3a1f5ae66ec6c715947d7acf4da688':
  Revert "Revert "Service data and manufacturer data can be repeated fields.""
 2014-08-01 21:02:02 +00:00
Eric Laurent
eb73cb395d am 48180bc8: am d5ec806a: am 991bd713: Merge "unhide AudioFormat getters" into lmp-dev 
* commit '48180bc8de1a9e4c1272bceea76c99843d125567':
  unhide AudioFormat getters
 2014-08-01 21:01:37 +00:00
Fergus Henderson
8fa71053c9 am 5604c46c: am 73193a76: am e55aaa30: Merge "Simplify generics, and make Builder concrete." into lmp-dev 
* commit '5604c46c303e4a4d70476bd709d7533f9a5d19fa':
  Simplify generics, and make Builder concrete.
 2014-08-01 20:50:44 +00:00
Chris Wren
a3b59dbfc2 am 7d902825: am 4ba63196: am 949c6e3a: Expose headsUpContentView so developers can customize it. 
* commit '7d902825399fbba5c84a62292305e844ca0ad9a5':
  Expose headsUpContentView so developers can customize it.
 2014-08-01 20:50:34 +00:00
Sungsoo Lim
3f8ddc51fc am bf1c5722: am 6d376986: am eb77c228: Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev 
* commit 'bf1c5722801bcecfcf030ff4c80e694d1814b325':
  TIF: Use XML file for representing TvContentRating
 2014-08-01 20:50:25 +00:00
Sungsoo Lim
087a6fe30e am d1ea6778: am 2df78bef: am 05df1176: Merge "Revert "Service data and manufacturer data can be repeated fields."" into lmp-dev 
* commit 'd1ea67785d6b6d2c9b86f5037257d523252bf4e6':
  Revert "Service data and manufacturer data can be repeated fields."
 2014-08-01 20:49:54 +00:00
Wei Wang
12f013dfa1 am bc61cadd: am 61e6c1e0: am 1d5fcf03: Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 
* commit 'bc61cadd12b6bc2a4ea396d97a23efe9fae4aa37':
  Service data and manufacturer data can be repeated fields.
 2014-08-01 20:49:45 +00:00
Sandeep Siddhartha
47607d07ea am f6a30eb6: am b8265920: am b8ffb28e: Merge "Tighten the checks around a detector being invalidated" into lmp-dev 
* commit 'f6a30eb6f86a16d5dae1ad392c5a08292e7f446a':
  Tighten the checks around a detector being invalidated
 2014-08-01 20:49:35 +00:00
Jeff Sharkey
96f0c8dd4f am 2b7fc490: am cc2e3136: am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev 
* commit '2b7fc490a7a2844ea2978b174eab34cb83e64b8b':
  Persist install sessions, more lifecycle.
 2014-08-01 20:49:25 +00:00
George Mount
23785adfe9 am b3bd029b: am dab97bb2: am 044a7d67: Add differentiating transitions for returning/reentering. 
* commit 'b3bd029b5ab2df8c86ab903bc597f858298be157':
  Add differentiating transitions for returning/reentering.
 2014-08-01 20:49:16 +00:00
Sandeep Siddhartha
2c0273e50a Add a flag for multiple triggers with same recognition session 
Also annotate the flags with @IntDef to make things clearer and safer

Add more debug logging

Revert to start/stop being synchronous since telephony and microphone will
need to be handled internally.

Bug: 16731586
Bug: 16514535
Bug: 16549061
Change-Id: I83695d52e9547269c95d443e4d921c9238b7401e
 2014-08-01 17:46:27 -07:00
Wei Wang
6bf513d32d Revert "Revert "Service data and manufacturer data can be repeated fields."" 
This reverts commit 14c797702543bb5ced989565d90abcfa55c7db46.
 2014-08-01 11:12:37 -07:00
Chris Wren
97c0b90f89 Expose headsUpContentView so developers can customize it. 
Bug: 13510114
Change-Id: I645c204e366fefab58224d2e67d00e701dc661aa
 2014-08-01 10:57:05 +00:00
Eric Laurent
9aa499ac42 Merge "unhide AudioFormat getters" into lmp-dev 2014-08-01 02:00:00 +00:00
Eric Laurent
0498269c00 unhide AudioFormat getters 
Bug: 12378680.
Change-Id: Ibe49c6386b12159e705f49f323cae27b6e2d749a
 2014-07-31 17:12:53 -07:00
George Mount
68f96d8db5 Add differentiating transitions for returning/reentering. 
Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
 2014-07-31 21:58:06 +00:00
Fergus Henderson
732af43eb1 Merge "Simplify generics, and make Builder concrete." into lmp-dev 2014-07-31 19:45:19 +00:00
Niels Egberts
2a236a6466 Simplify generics, and make Builder concrete. 
Change-Id: I3e14966527c254d2c15dddefc2ef60cdde30421f
 2014-08-01 11:46:16 +01:00
Jae Seo
484da7eb5f am e05ae199: am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit. 
* commit 'e05ae199c403c1ea399e81fbeed1d4bc9b7854e1':
  TIF: Make TvTrackInfo methods more explicit.
 2014-07-31 13:41:59 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair. 
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
 2014-07-31 09:30:13 +01:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit. 
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
 2014-07-31 16:15:51 +09:00
Lorenzo Colitti
87dffdd02b am 9200a867: am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '9200a867a71b02c0147b0a9670f1e141d398aa43':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:11:12 +00:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs. 
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
 2014-07-31 02:17:28 +00:00
Shishir Agrawal
81f10dbd01 am b169a41e: am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit 'b169a41e409ee6e62dc3c9403fd5a7129f921a23':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:22:35 +00:00
destradaa
d2cf9d98da am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:51:17 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Alan Viverette
4bfbac82e4 am 72cb9b21: am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '72cb9b21a3fc4173b42f85c052c0dee2fd137ac2':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:35:26 +00:00
keunyoung
176ded3d62 am 4e8e785e: am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4e8e785e2b7f58de656c7d473dcedd96c1a91e80':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:35:18 +00:00
Ye Wen
fad65f5394 am 54f3bf70: am 13f2726f: am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev 
* commit '54f3bf7043f0856a2064f1286a5e83da7130cca9':
  Move archived column from pdu/sms to threads (1/4)
 2014-07-30 20:27:02 +00:00
Wei Wang
76f3cceea6 Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 2014-07-29 22:44:51 +00:00
Wei Wang
3f7a39063a Service data and manufacturer data can be repeated fields. 
b/16635899

Change-Id: I73f1f4effd3f0e38cd427297eb9d22f3ba285d61
 2014-07-31 15:43:05 -07:00
Alan Viverette
46359204a8 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171 Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
 2014-07-30 13:37:35 -07:00
keunyoung
1d0a7ccd00 add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode 
- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
 2014-07-30 14:12:34 -07:00
Christoph Studer
3d5e26d659 am 09473140: am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '0947314029aa6c40f875703356a9c06417d356a8':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:45:02 +00:00
Sandeep Siddhartha
9a576f2174 am 041b0b6e: am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit '041b0b6ef8cd61014c5d00e05e0c2d322d675c42':
  Make startRecognition async
 2014-07-30 19:15:02 +00:00
Shishir Agrawal
a122e8df74 Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager. 
The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
 2014-07-30 18:09:53 -07:00
Jeff Sharkey
ceb2adca49 Merge "Persist install sessions, more lifecycle." into lmp-dev 2014-07-25 23:00:08 +00:00
Jeff Sharkey
1cb2d0d4bb Persist install sessions, more lifecycle. 
To resume install sessions across device boots, persist session
details and read at boot.  Drop sessions older than 3 days, since
they're probably buggy installers.

Add session callback lifecycle around open/close to give home apps
details about active installs.  Also give them a well-known intent
to show session details.

Extend Session to list staged APKs and open them read-only, giving
installers a mechanism to verify delivered bits, for example using
MessageDigest, before committing.

Switch to generating random session IDs instead of sequential.

Defensively resize app icons if too large.  Reject runaway
installers when they have too many active sessions.

Bug: 16514389
Change-Id: I66c2266cb82fc72b1eb980a615566773f4290498
 2014-07-31 15:17:03 -07:00
ztenghui
9f0fbaee64 am 1aa0970e: am 3520c8a9: am da818af6: API Review: VectorDrawable. Remove clipToPath, add MiterLimit 
* commit '1aa0970e75158557b032cf7bfc8db778debffbab':
  API Review: VectorDrawable. Remove clipToPath, add MiterLimit
 2014-07-30 17:17:16 +00:00
Yorke Lee
91f0295c8d am 9b5e2dd5: am 9dfe2c4d: am f4c289dc: Merge "ContactsContract API changes" into lmp-dev 
* commit '9b5e2dd5abbb46d07b3633010124cfef521816fe':
  ContactsContract API changes
 2014-07-30 17:11:20 +00:00
Kenny Guy
868428460a am 1c694e7e: am 39dbf079: am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev 
* commit '1c694e7e746766822e0c55548a01dca652f73264':
  Add optional handler to LauncherApps callback
 2014-07-30 16:53:42 +00:00
Jae Seo
9e96af9848 am a6377bb1: am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager 
* commit 'a6377bb178192f54a761325ff951a59cacd1d6e6':
  TIF: Merge TvParentalControlManager into TvInputManager
 2014-07-30 16:53:00 +00:00