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

152088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
c166b6c4fc Fix save count offsetting within DisplayList chunks 
bug:17388541
Change-Id: I7cb1139b8cd30f72ae7c6de2074c3c5865b8f309
 2014-09-05 19:55:30 -07:00
Etan Cohen
ed331ac5d3 am aa329284: Modified VoLTE configuration: separate device and carrier configs. 
* commit 'aa3292842775190686a2dcf1de7158b4aec25d3f':
  Modified VoLTE configuration: separate device and carrier configs.
 2014-09-06 02:44:28 +00:00
Etan Cohen
fdd41b3cbf Modified VoLTE configuration: separate device and carrier configs. 
Default device and carrier disabled.
Device to be overlayed in device/<xxx> dirs.
Carrier overlayed in this project.

Bug: 17365969
Change-Id: I95d58e934fc85506287069ddd71af4a5b7594bfb
 2014-09-06 02:30:12 +00:00
Eric Laurent
39fcca0a50 SoundTrigger: fix capture format in recognition event 
Also include capture format in recognition event
if capture is available for streaming. It was only
included if trigger was contained in event.

Bug: 17409062
Bug: 16731718
Change-Id: I5bf566e6bda57f23c870b4a1293e9b6d15d51e5a
 2014-09-05 18:56:33 -07:00
Dianne Hackborn
a4e102ee58 Work on issue #17357238: Recents is often slow if not used in a while 
Add a new activity attribute, resumeWhilePausing, that allows an
activity specifying it to immediately start running without waiting
for the previous activity to pause.  The recents activity is updated
to use this.

The implementation of this is ultimately fairly simple -- if we are
in the path of resuming such an activity, and find that we first need
to pause the existing activity, then within the activity manager we
do the regular pause flow but act like it has immediately finished
pausing right then so that we can immediately go on to the resume.
To make this clean, we tell the activity when asking it to pause that
it should not come back and tell us it is done, because we aren't in
any way waiting for it.

One potentially important change I needed to make here is the pause
callback no longer provides the saved persistent state, because we
now can't count on that callback happening.  I don't think there was
really any utility in this anyway -- all modern apps will have their
save state flow happen as part of stopping, not pausing, so we'll
only capture that saved state when the stop is reported back anyway.
And since we do send the saved state back when stopping, it would
always blow away whatever we had gotten at the pause.

Finally, update the documentation for AppTask.startActivity(), and
fix the implementation handling that to be cleaner -- we need to
deal with inTask first before getting in to "oh noes add NEW_TASK
if this isn't coming from a calling activity" flow.

Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f
 2014-09-05 18:43:43 -07:00
Eric Rowe
974390debf am 94614a7e: Merge "Increase long timeout to 2 minutes" into lmp-dev 
* commit '94614a7ea84eaf56ea249f60b004b1a8ce7c97ca':
  Increase long timeout to 2 minutes
 2014-09-06 01:37:15 +00:00
Eric Rowe
f7efe33da2 Merge "Increase long timeout to 2 minutes" into lmp-dev 2014-09-06 01:28:23 +00:00
Christopher Tate
7eeea906c3 am 57f1f19d: Merge "Fix binder identity use when clearing wallpapers" into lmp-dev 
* commit '57f1f19d02f5063458a05085c3d8875585c04ad3':
  Fix binder identity use when clearing wallpapers
 2014-09-06 01:17:41 +00:00
Junda Liu
7af9e274ee am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev 
* commit '8e250c572a6d56ba6b3645faa5b32edf1e795442':
  Hide APIs for simplified network settings.
 2014-09-06 01:17:35 +00:00
Christopher Tate
b75dd5cedd Merge "Fix binder identity use when clearing wallpapers" into lmp-dev 2014-09-06 01:01:26 +00:00
Christopher Tate
ecd827ac0d Fix binder identity use when clearing wallpapers 
Don't restore it too soon, because the rarely-needed fallback path
will need to be executed as system, too.

Bug 17394246

Change-Id: Ic5e662d4eae331b016fc91ffd08647bd8d4d6ff3
 2014-09-05 17:57:16 -07:00
Junda Liu
c6bd32e94f Merge "Hide APIs for simplified network settings." into lmp-dev 2014-09-06 00:55:30 +00:00
Dianne Hackborn
b7f203e23b am 8c7605b1: Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev 
* commit '8c7605b11939713e7540813933d91f006027426d':
  Fix issue #17397177: BatteryStats reporting error on job start/stop
 2014-09-06 00:55:13 +00:00
Justin Koh
9445d2a7f2 am 5b3d4452: Merge "Make the image wallpaper component overlayable" into lmp-dev 
* commit '5b3d4452660d933fc1f33470c3b7c0dc5ec89638':
  Make the image wallpaper component overlayable
 2014-09-06 00:55:08 +00:00
Dianne Hackborn
7895bc2e63 Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20 
Change-Id: Iaf271c96901c5dba15831681269a49ad4aaa57fd
 2014-09-05 17:50:47 -07:00
Dianne Hackborn
ce78347c37 Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev 2014-09-06 00:49:28 +00:00
Justin Koh
4021e50861 Merge "Make the image wallpaper component overlayable" into lmp-dev 2014-09-06 00:45:41 +00:00
Dianne Hackborn
c3940bc1ba Fix issue #17397177: BatteryStats reporting error on job start/stop 
Dumb, dumb, dumb mistake.

Also fix battery stats wakeup reason tracking to use a SamplingTimer
(like kernel wake locks) so we can track both the duration and count
for each wakeup reason.

Change-Id: I89d69661006dc533622b1b7e68a139166d3a6975
 2014-09-05 17:33:06 -07:00
Jon Miranda
befef20388 am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 
* commit '9f7fee392640eeba2922820e02d577a1a950702f':
  Added getStyleAttributes to access all Theme attributes.
 2014-09-06 00:29:53 +00:00
John Reck
9762ffc062 am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev 
* commit 'fd289c1c10c9da50a747f8eb4a52f49aad83f418':
  Disable RT-anim for AnimatorSet
 2014-09-06 00:29:49 +00:00
Jon Miranda
05cc48292b Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 2014-09-06 00:27:20 +00:00
Alan Viverette
e453da8baa am 9239ba20: Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 
* commit '9239ba20a85df91e9285d543bbeb1b1843d060d0':
  Propagate drawable hotspots when duplicate parent state is enabled
 2014-09-06 00:25:37 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
Justin Koh
29c3016128 Make the image wallpaper component overlayable 
This is necessary for devices that want to have wallpaper but don't have
SystemUi.

Bug: 17394246
Change-Id: I75c2a3a2120fd6600274d44059b3f85569b9a187
 2014-09-05 17:20:16 -07:00
Derek Tan
4fd94e6794 am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev 
* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
  Update the preferred network type APIs.
 2014-09-06 00:17:34 +00:00
Alan Viverette
9ffe8c06e5 Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 2014-09-06 00:15:09 +00:00
Derek Tan
bf7f53e29d Merge "Update the preferred network type APIs." into lmp-dev 2014-09-06 00:10:12 +00:00
Derek Tan
54e883bedc Update the preferred network type APIs. 
Bug: 17255752
Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
 2014-09-05 17:06:46 -07:00
Tsuwei Chen
04800b8317 am 30028094: Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev 
* commit '3002809499ff5bf65c40fd085801a50a92bf218f':
  Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152
 2014-09-06 00:03:38 +00:00
Adam Lesinski
7c092bf232 am b604d63b: Store time offsets for UsageStats XML 
* commit 'b604d63b183ebd69ac6bd0112dd340f34cbcacef':
  Store time offsets for UsageStats XML
 2014-09-06 00:03:33 +00:00
Adam Lesinski
1213eca61c am 0955da29: Merge "Returns UsageEvents from previous days" into lmp-dev 
* commit '0955da29aa40d446dff58260c4ae404255a773d0':
  Returns UsageEvents from previous days
 2014-09-06 00:03:26 +00:00
Derek Tan
0f7a0a4b1a am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev 
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
  Remove setCdmaSubscription API.
 2014-09-06 00:03:22 +00:00
Eric Rowe
f5031e5494 Increase long timeout to 2 minutes 
Change-Id: I2f9e15c6e551536d61ec52fbaf7f54405fa05bcd
 2014-09-05 16:59:51 -07:00
Tsuwei Chen
fec0f4fc30 Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev 2014-09-05 23:59:13 +00:00
Adam Lesinski
37a46b48dc Store time offsets for UsageStats XML 
This will make adjusting for time changes easier
in the future.

Change-Id: I49d2dda4cc6dcb1378a58c814849924f585e0417
 2014-09-05 23:57:42 +00:00
Adam Lesinski
cd922b29b5 Merge "Returns UsageEvents from previous days" into lmp-dev 2014-09-05 23:57:19 +00:00
Derek Tan
50e8b3d9bb am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev 
* commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80':
  Update the comment in sendEnvelope.
 2014-09-05 23:54:58 +00:00
Shishir Agrawal
11f27ff315 am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 
* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
  API change: SetOperatorBrandOverride should not take iccId as a param.
 2014-09-05 23:54:53 +00:00
Santos Cordon
2d7970ea53 am 6918cef8: Merge "Updating APIs for CDMA conference call support." into lmp-dev 
* commit '6918cef8ab9adb03547f2933705a29d22c878598':
  Updating APIs for CDMA conference call support.
 2014-09-05 23:54:37 +00:00
Alan Viverette
16d2d510f7 am c0b09353: Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 
* commit 'c0b093530336a9016acfbb333dbd35784c2cf60a':
  Simplify ripple background drawing, fix ripple alphas
 2014-09-05 23:54:33 +00:00
Derek Tan
b5928445d1 Merge "Remove setCdmaSubscription API." into lmp-dev 2014-09-05 23:53:55 +00:00
Derek Tan
a0729d3487 Merge "Update the comment in sendEnvelope." into lmp-dev 2014-09-05 23:53:10 +00:00
Shishir Agrawal
1244333998 Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 2014-09-05 23:51:40 +00:00
Junda Liu
b8025f3260 Hide APIs for simplified network settings. 
Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
 2014-09-05 16:46:38 -07:00
Santos Cordon
f7c8b58e84 Merge "Updating APIs for CDMA conference call support." into lmp-dev 2014-09-05 23:46:11 +00:00
Jean-Michel Trivi
749eec706a am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev 
* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras
 2014-09-05 23:46:05 +00:00
Jean-Michel Trivi
ae104eb6c6 am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev 
* commit '1c01afc06ed47fbd983bc8e7c52851d0518021d7':
  AudioAttributes: unhide CREATOR
 2014-09-05 23:46:00 +00:00
Alan Viverette
e9921370d7 Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 2014-09-05 23:45:36 +00:00
Jeff Sharkey
d560851911 am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.
 2014-09-05 23:41:14 +00:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00