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

178425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marvin Paul
6879555723 Buffer SettingsBackupAgent checksum writes 
Reduce SettingsBackupAgent I/O when writing new checksum by wrapping
FileOutputStream in a BufferedOutputStream.

Bug: 18674340

Change-Id: Ia8169445d42d032e24d8a395e678295f67841a65
 2014-12-16 16:27:49 -08:00
Tim Murray
bdcb0e5265 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: 501c710

* commit '501c710ec556571d33d3e73642eff158544639de':
  Fix typo with register native allocation.
 2014-12-16 21:50:16 +00:00
Tim Murray
a9c56a04a8 am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation." 
automerge: d58370e

* commit 'd58370efc1409b4130b30f82b47f39ee14d502b5':
  Fix typo with register native allocation.
 2014-12-16 21:48:55 +00:00
Tim Murray
501c710ec5 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-12-16 21:43:02 +00:00
Tim Murray
d58370efc1 am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation." 
* commit '68a81bd8817e997cace3bedf8a013d2cdaff9daa':
  Fix typo with register native allocation.
 2014-12-16 21:42:54 +00:00
Tim Murray
d46f43f276 am fac7bfd6: am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit 'fac7bfd6e4e6d8484b93afabc7fbd31968693a64':
  Fix typo with register native allocation.
 2014-12-16 21:42:18 +00:00
Tim Murray
68a81bd881 am 8de16999: Merge "Fix typo with register native allocation." 
* commit '8de169993f0078bfdd064499c48b9d124cb438be':
  Fix typo with register native allocation.
 2014-12-16 21:36:43 +00:00
Tim Murray
fac7bfd6e4 am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit '6c02facd83f1fa1ebf11d9cfda9872232c2d2d15':
  Fix typo with register native allocation.
 2014-12-16 21:36:37 +00:00
Tim Murray
6c02facd83 Merge "Fix typo with register native allocation." into lmp-mr1-dev 2014-12-16 21:33:03 +00:00
Tim Murray
8de169993f Merge "Fix typo with register native allocation." 2014-12-16 21:30:58 +00:00
Christopher Tate
4328db5769 am 892e65cb: am 0dab4dc0: Fix bad alarm delivery 
automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery
 2014-12-16 21:15:25 +00:00
Christopher Tate
7c1f995b7b am 892e65cb: am 0dab4dc0: Fix bad alarm delivery 
* commit '892e65cb2ac4b4917b41060300bbaa3414233394':
  Fix bad alarm delivery
 2014-12-16 21:13:25 +00:00
Christopher Tate
892e65cb2a am 0dab4dc0: Fix bad alarm delivery 
* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
  Fix bad alarm delivery
 2014-12-16 21:07:54 +00:00
Ying Wang
4a3b5bdc7f am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
automerge: cd69b5a

* commit 'cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:59:18 +00:00
Ying Wang
cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:57:35 +00:00
Christopher Tate
0dab4dc03d Fix bad alarm delivery 
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb42bd799287936c5aee0d30fbcc7e65c from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
 2014-12-16 12:54:49 -08:00
Ying Wang
49b2f00acf am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit 'c80c12dda9c1ce11affdccb2923b2e570daacfcd':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:50:58 +00:00
Alexandra Gherghina
de67e27e6b Merge "Fix image conversion" 2014-12-16 20:46:18 +00:00
Ying Wang
c80c12dda9 Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:46:17 +00:00
Ying Wang
34db51cdd7 Cleanup Obsolete LOCAL_PRELINK_MODULE. 
Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
 2014-12-16 12:45:49 -08:00
Christopher Tate
e01429cc58 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
automerge: a8fe14a

* commit 'a8fe14a2116e68b22aa9f5d9aefb27e373dc4074':
  Turn debug flag off
 2014-12-16 20:38:31 +00:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
 2014-12-16 20:34:37 +00:00
Pavel Zhamaitsiak
3c78e6a35e am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
automerge: 4abd09f

* commit '4abd09f773a938fe006e4cc0839f0dc6023cb2f3':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:38:41 +00:00
Pavel Zhamaitsiak
4abd09f773 am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:37:15 +00:00
Pavel Zhamaitsiak
ab4f9976e0 am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ec3f46a5ec961e7f41d1e0d40e97806e9767bfb3':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:32:24 +00:00
Pavel Zhamaitsiak
ec3f46a5ec Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 2014-12-16 19:27:37 +00:00
Christoph Studer
3f8140543e am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
automerge: 2bd62b5

* commit '2bd62b53b68834cabb48be608ee350012b1e8043':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:34:33 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +00:00
Christoph Studer
88fb463ea3 am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:26:26 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00
Adam Powell
0b3d12aadf am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
automerge: ea12691

* commit 'ea12691338cba1d3b6547b6eefb52388f1ed4a28':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:15:21 +00:00
Tim Murray
c13160a5c1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 10:13:05 -08:00
Adam Powell
ea12691338 am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:13:01 +00:00
Adam Powell
91ff85da1a am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '67af29f6d642c3c578ee1b5af70dc525955982a5':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:08:34 +00:00
Adam Lesinski
f72b541026 am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 
automerge: 915f44e

* commit '915f44e1ee98f8c1d1b9ac0ac45ee05d656734a6':
  AAPT: Copy android:revisionCode to Splits
 2014-12-16 18:03:35 +00:00
Adam Lesinski
915f44e1ee am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 
* commit '503a4494d64d30f9b904b24a56fff986810da610':
  AAPT: Copy android:revisionCode to Splits
 2014-12-16 18:02:09 +00:00
Alan Viverette
b910bd7615 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-16 18:01:26 +00:00
Adam Powell
67af29f6d6 Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 2014-12-16 18:01:04 +00:00
Tim Murray
d11a658db1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 09:59:09 -08:00
ztenghui
825096df5f am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 
automerge: 8a23b38

* commit '8a23b3820d6f4d08b6b6ca3ffb0f85bd829f5e97':
  Remove 2 sub-tests from the internal test app.
 2014-12-16 17:58:27 +00:00
Adam Lesinski
503a4494d6 am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 
* commit 'f1f179a765b6969ba51574d4a10b0381acb0f945':
  AAPT: Copy android:revisionCode to Splits
 2014-12-16 17:57:07 +00:00
ztenghui
8a23b3820d am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 
* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a':
  Remove 2 sub-tests from the internal test app.
 2014-12-16 17:56:51 +00:00
ztenghui
84c7ef8a28 am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 
* commit 'd8ce65c9b5142ff9aeadb4caecd46a4811021d7b':
  Remove 2 sub-tests from the internal test app.
 2014-12-16 17:51:54 +00:00
Adam Lesinski
f1f179a765 Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 2014-12-16 17:50:04 +00:00
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions 
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
 2014-12-16 09:48:27 -08:00
ztenghui
d8ce65c9b5 Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 2014-12-16 17:45:02 +00:00
Andre Eisenbach
284e66e23c am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
automerge: 7ea97e2

* commit '7ea97e28e6a2271fd4d60c07b4fa83e019e3474a':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:30:33 +00:00
Andre Eisenbach
7ea97e28e6 am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:27:46 +00:00
Andre Eisenbach
f6b62a9d91 am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:21:13 +00:00
Andre Eisenbach
cd460538a4 Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev 2014-12-16 17:16:55 +00:00