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

112081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
7407850c8a am 1a81725e: am 6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev 
* commit '1a81725ececffe68af466d1f8dcea56b86a84247':
  Unhide USAGE_IO_INPUT functions
 2013-08-29 14:28:33 -07:00
Jason Sams
1a81725ece am 6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev 
* commit '6b115980483ec20cc3f7817c76dfea18c49a48f3':
  Unhide USAGE_IO_INPUT functions
 2013-08-29 14:26:29 -07:00
Jason Sams
6b11598048 Merge "Unhide USAGE_IO_INPUT functions" into klp-dev 2013-08-29 21:24:28 +00:00
Craig Mautner
dc57bbebb2 am e8f73b78: am a78d9a24: Merge "Reset activity\'s "return to home" flag on relaunch" into klp-dev 
* commit 'e8f73b78f010cb01849fe7b0d0eeee60adb7eb2b':
  Reset activity's "return to home" flag on relaunch
 2013-08-29 14:20:39 -07:00
Craig Mautner
e8f73b78f0 am a78d9a24: Merge "Reset activity\'s "return to home" flag on relaunch" into klp-dev 
* commit 'a78d9a24d97818a6c9c071483d7854b560ecf228':
  Reset activity's "return to home" flag on relaunch
 2013-08-29 14:17:34 -07:00
Craig Mautner
a78d9a24d9 Merge "Reset activity's "return to home" flag on relaunch" into klp-dev 2013-08-29 21:14:31 +00:00
Martijn Coenen
b86f00a077 am 10581450: am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev 
* commit '1058145049b1307aea452a198bced1d38d2b9b72':
  Add an API for querying HCE service selection mode.
 2013-08-29 14:09:34 -07:00
Martijn Coenen
1058145049 am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev 
* commit 'a6dcf1a2d634bd8c26b6a5744fc38874bcac6dd9':
  Add an API for querying HCE service selection mode.
 2013-08-29 14:06:22 -07:00
Martijn Coenen
a6dcf1a2d6 Merge "Add an API for querying HCE service selection mode." into klp-dev 2013-08-29 21:01:16 +00:00
Jason Sams
42ef238208 Unhide USAGE_IO_INPUT functions 
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
 2013-08-29 13:30:59 -07:00
Martijn Coenen
c3f0044abe Add an API for querying HCE service selection mode. 
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".

Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.

Bug: 10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
 2013-08-29 13:23:03 -07:00
Martijn Coenen
f42c0fcb90 am ff8ec5c5: am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 
* commit 'ff8ec5c56fd81f977c46a39badfd7de3bbfebfdd':
  Add requireDeviceUnlock attribute for NFC HCE.
 2013-08-29 12:59:43 -07:00
Martijn Coenen
ff8ec5c56f am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 
* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.
 2013-08-29 12:57:33 -07:00
Martijn Coenen
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00
Craig Mautner
e12a4a6810 Reset activity's "return to home" flag on relaunch 
When relaunching an activity re-evaluate the flag that determines
whether to return to the next activity on the stack or to the home
activity upon return.

Fixes bug 10545580.

Change-Id: I5868ce1b494afffcc5afc22abe3b65aa339827bb
 2013-08-29 12:24:56 -07:00
Igor Murashkin
7a8df11460 am d5d91948: am c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 
* commit 'd5d91948cd4bf6f8352f1ec24b51af7047b9661b':
  media: ImageReader throws OutOfResourcesException when out of buffers
 2013-08-29 12:05:37 -07:00
Igor Murashkin
d5d91948cd am c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 
* commit 'c7d515aa219a93dc487de2a1bd762897602160c7':
  media: ImageReader throws OutOfResourcesException when out of buffers
 2013-08-29 12:03:27 -07:00
Igor Murashkin
c7d515aa21 Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 2013-08-29 18:59:10 +00:00
Vineeta Srivastava
beaa1c53c9 am 1aa64611: am 4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 
* commit '1aa646113daf7c85d6b443d5ec47bea024adaa7a':
  uicc : add config_stkNoAlphaUsrCnf to config.xml
 2013-08-29 11:46:10 -07:00
Vineeta Srivastava
1aa646113d am 4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 
* commit '4fa9204d0f28ba3823ec9f4c8a9912a416eee397':
  uicc : add config_stkNoAlphaUsrCnf to config.xml
 2013-08-29 11:44:03 -07:00
Vineeta Srivastava
4fa9204d0f Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 2013-08-29 18:41:27 +00:00
duho.ro
54ad798aef uicc : add config_stkNoAlphaUsrCnf to config.xml 
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.

Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f

Conflicts:
	core/res/res/values/config.xml
 2013-08-29 11:35:09 -07:00
John Spurlock
57117d0a8d am 47a41af5: am e87bc32e: Merge "More SystemUI asset updates." into klp-dev 
* commit '47a41af51030fc6c504c9a3ee250ddf7a8c5f5ba':
  More SystemUI asset updates.
 2013-08-29 11:08:37 -07:00
John Spurlock
47a41af510 am e87bc32e: Merge "More SystemUI asset updates." into klp-dev 
* commit 'e87bc32e6d6991b1de72e914f268efc276837e47':
  More SystemUI asset updates.
 2013-08-29 11:05:48 -07:00
John Spurlock
e87bc32e6d Merge "More SystemUI asset updates." into klp-dev 2013-08-29 18:03:58 +00:00
Geoffrey Borggaard
0f857060d0 am 114bf32f: am 06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev 
* commit '114bf32f9cec80cb7ec8c418c41f044bce2ffd85':
  UserManagerService upgrades users on first restart.
 2013-08-29 11:03:51 -07:00
Isaac Katzenelson
8117047ac7 am 87fe4c28: am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 
* commit '87fe4c28d3784d7eceabb56ee25f785d89577844':
  Add ACTION_SHOW_ALARMS to Clock API
 2013-08-29 11:03:47 -07:00
Geoffrey Borggaard
114bf32f9c am 06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev 
* commit '06b9bb0c813b3d7f93d4069b97cd255f329c4c37':
  UserManagerService upgrades users on first restart.
 2013-08-29 10:57:50 -07:00
Isaac Katzenelson
87fe4c28d3 am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 
* commit '1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
  Add ACTION_SHOW_ALARMS to Clock API
 2013-08-29 10:57:47 -07:00
John Spurlock
fc3c06ef21 More SystemUI asset updates. 
White close handles, a few missed xx items.

Bug:10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
 2013-08-29 13:56:31 -04:00
Geoffrey Borggaard
06b9bb0c81 Merge "UserManagerService upgrades users on first restart." into klp-dev 2013-08-29 17:54:37 +00:00
Isaac Katzenelson
1d04b640ec Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 2013-08-29 17:52:32 +00:00
Sam Blitzstein
2f7acd19be Add ACTION_SHOW_ALARMS to Clock API 
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.

Bug: 10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
 2013-08-29 10:49:57 -07:00
Leon Scroggins III
f7142e3e8b am af172519: am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 
* commit 'af1725190fbb8dd7c29726f8b7c072f3af734aed':
  Replace stream wrap-function w/ more specific ones
 2013-08-29 10:24:21 -07:00
Leon Scroggins III
af1725190f am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 
* commit '4b2993123bf9a1c56d0a16b032612834dd418520':
  Replace stream wrap-function w/ more specific ones
 2013-08-29 10:22:48 -07:00
Leon Scroggins III
4b2993123b Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 2013-08-29 17:12:01 +00:00
Geoffrey Borggaard
15b8b2c068 UserManagerService upgrades users on first restart. 
This causes all restriction pins to be reset.

Bug: 10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
 2013-08-29 13:07:49 -04:00
Mike Klein
f5b43bdc62 SkTScopedPtr -> SkAutoTDelete in Android 
Change-Id: I8f0312f34e112d302b05852c31308a43967e7a3f
 2013-08-29 11:15:06 -04:00
Baligh Uddin
c882eb73e6 Merge "Import translations. DO NOT MERGE" 2013-08-29 14:49:42 +00:00
Brian Carlstrom
7bf4ed20ba am 2b8408da: resolved conflicts for merge of 7be3a138 to klp-dev-plus-aosp 
* commit '2b8408dab1f8436bc5fce3d64c37fee1bd9f3932':
  Add frameworks support for sample profiling from traceview gui.
 2013-08-29 00:21:13 -07:00
Brian Carlstrom
2b8408dab1 resolved conflicts for merge of 7be3a138 to klp-dev-plus-aosp 
Change-Id: If562a3203b4e737c685ec533f2d8773cae7f16ac
 2013-08-29 00:10:56 -07:00
Baligh Uddin
1b0a22285d Import translations. DO NOT MERGE 
Change-Id: I47a12de30bcf92829bbfa2a84e42715bb779ceef
Auto-generated-cl: translation import
 2013-08-28 23:27:16 -07:00
Jeff Hao
7be3a138d5 Add frameworks support for sample profiling from traceview gui. 
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
 2013-08-28 22:13:17 -07:00
Jeff Sharkey
98486543cc am 6607275b: am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev 
* commit '6607275b3a99b28f4176f8f8cc87f46c5ed051db':
  Stronger DocumentsProvider contract.
 2013-08-28 21:35:17 -07:00
Jeff Sharkey
6607275b3a am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev 
* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
  Stronger DocumentsProvider contract.
 2013-08-28 21:32:08 -07:00
Jeff Sharkey
9fd81a9008 Merge "Stronger DocumentsProvider contract." into klp-dev 2013-08-29 04:27:02 +00:00
Jeff Sharkey
aeb16e2435 Stronger DocumentsProvider contract. 
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.

This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.

This new design also relaxes the requirement that root information be
burned into every Uri.  Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.

Bug: 10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
 2013-08-28 20:49:42 -07:00
Baligh Uddin
5e20b72b0c am 28b8eb91: (-s ours) am 166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '28b8eb91bc2fda27bdde82dad3fcba01fbb4cd04':
  Import translations. DO NOT MERGE
 2013-08-28 20:12:02 -07:00
Baligh Uddin
8601ff79f5 am 8432461f: (-s ours) am 5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8432461f6e4b9f0236f6631b1ab83cf98eb95850':
  Import translations. DO NOT MERGE
 2013-08-28 20:11:59 -07:00
Baligh Uddin
5d2ddcc6de am 141e2d34: (-s ours) am 9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '141e2d3444b07c416341b0b1c1f48c5ddbee1904':
  Import translations. DO NOT MERGE
 2013-08-28 20:11:56 -07:00