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

146417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack. 
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
 2014-07-28 14:00:35 -07:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Filip Gruszczynski
d0e0339239 Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
40b0d4d751 Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
cbeef01cce Revert "DO NOT MERGE Fix line breaking for clusters in narrow views" 
This reverts commit a28e4764994283c3595dd41f12e425cf7dc0d985.

Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
 2014-07-28 19:52:11 +00:00
Alan Lau
97170e0c48 Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Anish Athalye
0c87dfd25d DO NOT MERGE Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
 2014-07-28 18:48:01 +00:00
Filip Gruszczynski
6393196f5d Fix double chin issue, where bottom inset is applied twice. 
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.

Bug: 16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
 2014-07-25 14:25:16 -07:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev 
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
 2014-07-25 02:19:53 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately 
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
 2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev 
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
 2014-07-24 18:06:03 +00:00
Robert Greenwalt
3a50a69a0e Merge "Remove dead code 3." into lmp-dev 2014-07-24 15:36:21 +00:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
Robert Greenwalt
1ea93a3b4f Remove dead code 3. 
Removing mNetRequestersPids and mPriorityList.

Change-Id: I8295040436b62f7f6495ece7154246fb719288a4
 2014-07-29 00:36:38 +00:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Riley Andrews
4789e41a9f Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev 2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2 Add cursor flags into SpriteController to suppor async cursor updates. 
- This is fairly blindly taken from nvidia's implementation.

Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
 2014-07-28 22:04:06 +00:00
Jing Zhao
03cab4cbe6 Enable config CDMA home system by mcc mnc 
Define CDMA home system IDs for Verizon

Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
 2014-07-28 21:53:52 +00:00
Winson Chung
b1b191ad66 Merge "Updating lock-to-app look." into lmp-dev 2014-07-25 21:16:23 +00:00
Winson Chung
2915b9d148 Updating lock-to-app look. 
- Adding seek bars for tweaking values when in debug mode

Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
 2014-07-28 22:26:36 +00:00
Eric Laurent
62dc1768d6 rename AudioSystem::newAudioSessionId() 
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.

Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
 2014-07-28 22:21:46 +00:00
Christopher Tate
7f25081a4d Merge "Provide outside-facing API for data management intent+label" into lmp-dev 2014-07-27 22:35:46 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo 
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
 2014-07-28 06:57:04 +09:00
Jinsuk Kim
8c688ada2d MHL controller for subcommand reception 
Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
 2014-07-26 08:14:08 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay 
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
 2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed. 
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
 2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539 Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540) 2014-07-25 22:47:33 +00:00
Baligh Uddin
95c58ed763 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 15:37:54 +00:00
Baligh Uddin
c9c3a9c9db Import translations. DO NOT MERGE 
Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b
Auto-generated-cl: translation import
 2014-07-28 23:12:12 +00:00
Mike Lockwood
9e61436424 Merge "android.media.AudioPatch: update comment" into lmp-dev 2014-07-24 15:36:21 +00:00
Mike Lockwood
31b2d8ee43 android.media.AudioPatch: update comment 
Change-Id: Ic5470c49be4b4f4dcda8db8f2d1153afe2e84ad1
 2014-07-28 14:40:12 -07:00
Jorim Jaggi
ab71126576 Fix QS overscroll flickering 
Change-Id: I7f514285ec8de185e6f443d6943f0bd711dcac26
 2014-07-28 20:38:32 +00:00