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

1023 Commits

Author SHA1 Message Date
Cheuksan Wang
b72eb97e4b new SMS/MMS carrier app API 
Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
 2014-12-01 18:11:07 -08:00
Jorim Jaggi
7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous
 2014-11-26 19:42:19 +00:00
Jim Miller
ab954546dc Make IKeyguardService interface asynchronous 
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.

Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
 2014-11-25 23:22:52 +01:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Jaewan Kim
e95b9dd57f am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f 
* commit 'b5ba786ccb9265ed076cda088ddbfded3ecc7f85':
  Add an API to check availability of Ethernet interface.
 2014-11-21 03:11:35 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Jaewan Kim
18ab5c216c Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 2014-11-20 23:07:43 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Jaewan Kim
d109a7cf69 Add an API to check availability of Ethernet interface. 
Bug: 18045481
Change-Id: I95358241b431cfe4435ce70c23c9a639b9dc4d58
 2014-11-20 11:12:17 +09:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Ying Wang
d0c45355b9 Move preloaded-classes out of framework.jar. 
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
 2014-11-17 11:31:08 -08:00
Ying Wang
affbaee9c1 am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp 
* commit 'c2045047735522f50bc1d2618280bd37306f18d2':
  Move preloaded-classes out of framework.jar.
 2014-11-17 19:24:11 +00:00
Ying Wang
0de36e51c5 Move preloaded-classes out of framework.jar. 
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
 2014-11-17 10:15:39 +00:00
Abhijith Shastry
e3435feed4 am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
  new sms/mms carrier app API
 2014-11-14 19:16:33 +00:00
Abhijith Shastry
fb8db1c84b Merge "new sms/mms carrier app API" into lmp-mr1-dev 2014-11-13 22:15:46 +00:00
Yohann Roussel
248ef6f9c4 Allow compilation with Jack. 
Change-Id: I03ccd6cd92102f03d1316b6a1184c49029c91ea0
 2014-11-13 12:05:23 +01:00
Renato Mangini
3c77022299 am 7b3b8804: am 8d6699cc: am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '7b3b8804e7da463dc14b142e5e4323350cdb9bc7':
  Fix the order of sample categories left nav.
 2014-11-13 02:15:12 +00:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Cheuksan Wang
f9c50c45c6 new sms/mms carrier app API 
BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
 2014-11-12 15:29:41 -08:00
Renato Mangini
1b657d9243 Fix the order of sample categories left nav. 
Bug: 18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
 2014-11-12 14:07:48 -08:00
Renato Mangini
42ec09fb2f am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
automerge: d76afdb

* commit 'd76afdb5e7978b5d57214bd83cacc754e23bfe60':
  Add "notification" category for samples.
 2014-11-12 18:11:24 +00:00
Renato Mangini
2a3ce1853c am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3':
  Add "notification" category for samples.
 2014-11-12 17:56:20 +00:00
Wink Saville
eb05351001 SubInfoRecord.aidl renamed to SubscriptionInfo.aidl 
Change-Id: Ib56ce09ee8ee33fbfc454a83a2e1484056e17020
 2014-11-12 08:53:32 -08:00
Adrian Roos
7bfd6bd37f am 6fafa8cd: am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache 
* commit '6fafa8cdcecbb7daf1c96e15c513f8ff7260df80':
  Obliterate LockPatternUtilsCache
 2014-11-12 16:37:52 +00:00
Adrian Roos
138b83347b Obliterate LockPatternUtilsCache 
It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.

Bug: 18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
 2014-11-12 11:31:38 +00:00
Renato Mangini
4b7b68d824 Add "notification" category for samples. 
Bug: 18323953
Change-Id: Ifb78015604fd203baaf5f4c6496a86aa6c831227
 2014-11-11 19:51:53 -08:00
Wink Saville
f78c50e6da am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c 
* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:45:30 +00:00
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 11:48:04 -08:00
Dianne Hackborn
35ed2f4c39 am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
  Add Activity API to get referrer information.
 2014-11-11 01:03:02 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information. 
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
 2014-11-11 00:42:18 +00:00
Trevor Johns
3b3b5fa484 am 2cf2406d: am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '2cf2406d9832bfb74b87b92eadd896c6e90bce46':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:31:15 +00:00
Trevor Johns
abcb138da8 Docs: Add TOC page for Wearable samples 
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
 2014-10-23 09:29:05 -07:00
Evan Charlton
072d4f93f3 am 7468bb98: am e3d3aa3f: am df88ad0b: am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '7468bb98d52013d63af665b29b1a8e859fb74f75':
  Add WindowManager.aidl to AIDL list
 2014-10-16 07:00:24 +00:00
Evan Charlton
843e234318 Add WindowManager.aidl to AIDL list 
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.

This affects the SDK only

Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
 2014-10-15 13:26:32 -07:00
Evan Charlton
5db046bda4 resolved conflicts for merge of 9963fc12 to master 
Change-Id: I2339dcafc38693bf6c89d4e3643627270791442e
 2014-10-14 11:06:32 -07:00
Evan Charlton
b298a5a594 Update the SDK AIDL list 
Populate the framework.aidl list with .aidl files which are:
  - In the android.* namespace
  - Not marked @hide
  - Do not have their corresponding .java files marked @hide

Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
 2014-10-13 15:12:57 -07:00
smain@google.com
b90ca71683 am 5c90ccc3: am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '5c90ccc34e3fc13ac9c0ffbc52581bf02c0bf32b':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-10 18:40:28 +00:00
smain@google.com
12c50e0ed0 update droiddoc option to include api level 21 for javadoc tagging 
Change-Id: Ifdb09267b0cdab4cd89aaea455de6270481ff230
 2014-10-08 16:23:34 -07:00
Andres Morales
873560bc7e am 81f06a6d: am 1603e30e: am 6ef845d3: am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit '81f06a6dce17ea44fd6a3110a15aec490cea4b2b':
  Remove dead NFC unlock code from fw/base
 2014-10-07 20:40:53 +00:00
Andres Morales
052690540e Remove dead NFC unlock code from fw/base 
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
 2014-10-06 16:04:19 -07:00
Tyler Gunn
cc616bca0d am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
 2014-09-13 18:19:31 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Jinsuk Kim
5ae2f08971 am db7eb5b3: am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev 
* commit 'db7eb5b3c87c56128b421f5928242246f3261b39':
  Replace the MHL register name 'scratchpad' with 'vendor'
 2014-09-12 19:26:08 +00:00
Jinsuk Kim
b3fbf9dbe8 Replace the MHL register name 'scratchpad' with 'vendor' 
Bug: 17479050
Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
 2014-09-12 10:42:14 +09:00
Griff Hazen
040bb0b0ed am e9a3faa5: am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit 'e9a3faa5d20d0adeed4a5bec8f3aeb131324b3f4':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:23:55 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
RoboErik
b59eacf5fe resolved conflicts for merge of a41f48f8 to master 
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
 2014-09-05 14:29:31 -07:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser 
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
 2014-09-05 11:40:34 -07:00