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

161645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prem Kumar
fa205ffff2 am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit '9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 19:59:40 +00:00
Prem Kumar
cb9379ca77 am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit '6c2fa049aa342ed09c6987302d79a9447b99e5a4':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 19:59:35 +00:00
Prem Kumar
9ef07ad2b6 Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Guang Zhu
d8ca1208b3 am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev 
* commit '07bba9abeeba77cdf491ecc3047d1fa34f280bbb':
  shell based UI Automator source move
 2014-12-14 03:39:07 +00:00
Guang Zhu
07bba9abee Merge "shell based UI Automator source move" into lmp-mr1-dev 2014-12-14 03:30:57 +00:00
Jinsuk Kim
d8858fa917 am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
* commit 'a2bc055eeb240c1787e7ad9755ffd4f106bdbb63':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:46:38 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Guang Zhu
18b892c723 shell based UI Automator source move 
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
 2014-12-12 17:31:38 -08:00
Christopher Tate
36ba3e478f am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
  Check which file changed before requesting backup
 2014-12-13 00:59:10 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Amith Yamasani
52d750c5c2 Check which file changed before requesting backup 
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.

Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
 2014-12-13 00:15:45 +00:00
Tim Murray
54bab10b1f am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 
* commit 'a6bfe6c957739fc172dd97ce4e26d8ec4ee4aa6f':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:10:46 +00:00
Tim Murray
a6bfe6c957 Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 2014-12-13 00:03:53 +00:00
Bart Sears
10fe046c93 am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
* commit '1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
  Tune delivery and batching of alarms
 2014-12-12 22:49:43 +00:00
Bart Sears
1f28a6a571 resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
 2014-12-12 14:19:57 -08:00
Alan Viverette
e260a358bf am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:04:10 +00:00
Alan Viverette
1060d75e3a am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '9a1b4c29672f7b7a8cfdeedfc2421854439c0af0':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:04:04 +00:00
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967 Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending 
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
 2014-12-12 13:38:10 -08:00
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 13:30:15 -08:00
Chong Zhang
d4bef185a5 am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'bb177db1fe39f0855f79c15195ae837d87479636':
  parse bitrate range for video/audio caps
 2014-12-12 20:54:49 +00:00
Svet Ganov
26c8895465 am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 20:54:43 +00:00
Svet Ganov
e608644a9f am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 20:54:38 +00:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
7486bc1f5a Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 2014-12-12 20:48:09 +00:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming 
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
 2014-12-12 12:34:15 -08:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps 
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
 2014-12-12 11:34:42 -08:00
Kenny Guy
dcd42f0fa1 am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
* commit '4357d4eabc375c392190cf2d1dfc3aeba9718ceb':
  Don't show last used and profile button at same time.
 2014-12-12 18:50:15 +00:00
Tim Kilbourn
d91985cd43 am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
* commit '2636ccc1857264a76db8ddaee600f06fadad3c36':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 18:50:10 +00:00
Kenny Guy
4357d4eabc Merge "Don't show last used and profile button at same time." into lmp-mr1-dev 2014-12-12 18:46:23 +00:00
Tim Kilbourn
2636ccc185 Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 2014-12-12 18:44:19 +00:00
Adam Powell
746079e2ee am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:43:38 +00:00
Jason Monk
f8dd5f6a19 am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController
 2014-12-12 18:43:33 +00:00
Jason Monk
106806270c am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit 'a68697005137c2b5c5feb43b8cac078f7b75ec18':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:43:28 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Jason Monk
a47f968d7e Merge "Handle config changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:40 +00:00
Jason Monk
a686970051 Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:26 +00:00
Tim Kilbourn
1991590ddd Revert "Attempt to fix keyguard missing bug" 
This reverts commit a5faf2415d5760d2239f85271b889d655b5c271b.
It prevents the launcher from showing up on Android TV.

Bug: 18724479
 2014-12-12 18:33:16 +00:00
Jinsuk Kim
48cbf292ba audioservice: Clear calling identity upon calling HdmiControlService 
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.

Bug: 18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
 2014-12-13 02:22:19 +09:00
Esteban Talavera
4f40fb4712 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 
automerge: c28fa2c

* commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:08:46 +00:00
Kenny Guy
b8a2df10c9 Don't show last used and profile button at same time. 
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.

Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
 2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 2014-12-12 16:59:31 +00:00
Jason Monk
3aaabd7124 Handle config changes in NetworkController 
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.

Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
 2014-12-12 11:56:11 -05:00
Jorim Jaggi
e741a3e9fe am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
* commit '8934e67051a7c2598ad94699037701c4c6bf83ca':
  Limit item count in QS detail
 2014-12-12 15:39:27 +00:00
Jorim Jaggi
19131b49f6 am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
* commit 'd3cccec08361effa5d0f47143ea8c521f49bad79':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:39:22 +00:00
Jorim Jaggi
569a113a19 am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
* commit 'ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:39:16 +00:00
Jorim Jaggi
8934e67051 Merge "Limit item count in QS detail" into lmp-mr1-dev 2014-12-12 15:32:57 +00:00