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

178216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prem Kumar
572ff423a7 am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
automerge: da6ebb4

* commit 'da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 20:10:01 +00:00
Prem Kumar
c270a1c878 am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
automerge: 3be9a9c

* commit '3be9a9cefb5f5c25c3b6ed85f41da8c5aa7b1e6b':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:08:52 +00:00
Prem Kumar
da6ebb4ee2 am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 20:06:28 +00:00
Prem Kumar
3be9a9cefb am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:06:22 +00:00
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
61e0abc2f5 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev 
automerge: 9954a44

* commit '9954a44896937d8f7fd7aebbe276c570101d4c77':
  shell based UI Automator source move
 2014-12-14 04:09:14 +00:00
Guang Zhu
9954a44896 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev 
* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
  shell based UI Automator source move
 2014-12-14 04:04:26 +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
c45ea929bc am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
automerge: 584c3df

* commit '584c3dfb53f7a795627a4ea8082ff54e83e4336a':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:55:40 +00:00
Jinsuk Kim
584c3dfb53 am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
* commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:53:29 +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
eef1cec0ed am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
automerge: fe9e319

* commit 'fe9e3195faaa795af5fd05fab694d9f51d06e454':
  Check which file changed before requesting backup
 2014-12-13 01:15:07 +00:00
Christopher Tate
fe9e3195fa am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
  Check which file changed before requesting backup
 2014-12-13 01:09:03 +00: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
Tim Murray
afcabff707 am 42d33aa6: am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior." 
automerge: 07a2efc

* commit '07a2efce2c3da9734c10754d379eedf177c91efd':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:23:37 +00:00
Tim Murray
07a2efce2c am 42d33aa6: am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior." 
* commit '42d33aa635fbe0768b0be44568077874e66e39e0':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:17:47 +00:00
Tim Murray
09e1c9153f am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev automerge: 54bab10 
automerge: efc5cea

* commit 'efc5ceaaa1f371bdd90c718f77a07cced7eaefc0':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:17:38 +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
efc5ceaaa1 am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 
automerge: 54bab10

* commit '54bab10b1facad1ae8ad522b57785f449f3227f9':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:15:08 +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
42d33aa635 am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior." 
* commit '3d00fdf4cbe9f8fe8363f4ad4fa6c98ae03573ac':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:09:38 +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
Tim Murray
3d00fdf4cb Merge "Enable native tracking for RS contexts to improve GC behavior." 2014-12-13 00:02:31 +00:00
Elliott Hughes
7f3a73c7b5 am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
automerge: a95b568

* commit 'a95b568f9afcabb067f5ec8ef602800a89d273ee':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:38:23 +00:00
Elliott Hughes
a95b568f9a am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:32:06 +00:00
Elliott Hughes
20c906a8d4 am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit 'a101befbef6a07af0746e3dbcd646d2b69a23492':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:24:37 +00:00
Elliott Hughes
a101befbef Merge "Lose some unnecessary JNI from the zygote." 2014-12-12 23:18:48 +00:00
Bart Sears
9071791c35 am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
automerge: 2648a66

* commit '2648a66bdae6a794f01dceda79fd7f623474c68c':
  Tune delivery and batching of alarms
 2014-12-12 22:59:05 +00:00
Bart Sears
2648a66bda am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
* commit '10fe046c93324903eea2667dd3ff679930ec997d':
  Tune delivery and batching of alarms
 2014-12-12 22:56:43 +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
Christopher Tate
7819d9fcf6 am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
automerge: 75070f2

* commit '75070f2f18bbbaa8065000684da64359d8545de9':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:47:36 +00:00
Christopher Tate
75070f2f18 am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
* commit '125579caa1b4fb2de4242b0af3f4749bac9fa699':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:45:34 +00:00
Christopher Tate
125579caa1 am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:37:47 +00:00
Paul Miller
ee87841395 Merge "Update CookieManager documentation" 2014-12-12 22:34:08 +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
5a4be5a2da am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
automerge: 81612d8

* commit '81612d80c5b2d40c8cf1fb03336a9b0f9249d82a':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:15:39 +00:00
Alan Viverette
0a69ae9666 am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
automerge: 2e0e2a4

* commit '2e0e2a44073e7417a42d97e9d7b82e050a845b4d':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:14:20 +00:00
Alan Viverette
81612d80c5 am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit 'e260a358bfc945bf01d901f496b7f30784cbf920':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:11:46 +00:00
Alan Viverette
2e0e2a4407 am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '1060d75e3abd37671b0962297f4587dd3d6e0cc8':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:11:40 +00:00
Christopher Tate
012de64e2d Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 2014-12-12 22:11:16 +00:00
Paul Miller
9d67f36651 Update CookieManager documentation 
The CookieManager documentation became incorrect after deprecating
CookieSyncManager. Remove the note about CookieSyncManager.

code.google.com/p/android/issues/detail?id=82052

Change-Id: I13bc52716cd71e47b67148186a69f7269e418864
 2014-12-12 22:08:03 +00:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote. 
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
 2014-12-12 14:07:34 -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