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

179593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
a6084bbda4 Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 automerge: c9a7694 
automerge: 7628fac

* commit '7628fac99fb23b71ae418b9833bc7e5d534c1e9a':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:21:37 +00:00
Andres Morales
7628fac99f Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 
automerge: c9a7694

* commit 'c9a76941ecca457e6a17b06f557c24e18e3bdafa':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:15:47 +00:00
Andres Morales
c9a76941ec Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 
automerge: d656955

* commit 'd656955efdd2e148d9390125b899e8fe2b677abd':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:13:17 +00:00
Andres Morales
d656955efd Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 2015-01-08 16:10:27 +00:00
Marcin Kosiba
3e853fb1d2 Un-break the WebView build. 
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.

Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
 2015-01-08 12:45:40 +00:00
Vladimir Marko
a2795c7d28 resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp 
automerge: 371d77e

* commit '371d77ecf684163b3bd1061e00191980f1fc90a1':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-08 10:52:37 +00:00
Vladimir Marko
371d77ecf6 resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
 2015-01-08 10:46:53 +00:00
Vladimir Marko
36401a3699 am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev 
* commit 'e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-08 10:28:27 +00:00
Vladimir Marko
e9a935f6b6 Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev 2015-01-08 10:24:51 +00:00
Bryce Lee
fa71a7433f Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96 automerge: d1646dc 
automerge: 1cad889

* commit '1cad8899be13e5eaefbc8300a832a826870ea7ca':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:42:40 +00:00
Bryce Lee
1cad8899be Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96 
automerge: d1646dc

* commit 'd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:38:01 +00:00
Bryce Lee
d1646dcfd1 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 
automerge: c010c96

* commit 'c010c96fdf143b242c9795a71b231ccb4658b625':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:32:40 +00:00
Bryce Lee
c010c96fdf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 2015-01-08 04:30:13 +00:00
Jinsuk Kim
701ee593ec am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 
automerge: 764a1ba

* commit '764a1ba86d3160e4b1e10aa1ac7477539321b42b':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:21:26 +00:00
Jinsuk Kim
764a1ba86d am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 
* commit '62a1e753b1f73f575c978a377efdc531e7a86b8f':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:18:01 +00:00
Jinsuk Kim
62a1e753b1 Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev 
automerge: 09d4e03

* commit '09d4e03736caa1baf07256fc5cd6d61b264021a7':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:11:47 +00:00
Jinsuk Kim
09d4e03736 Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev 2015-01-08 04:08:54 +00:00
Jinsuk Kim
6e26f7f7b0 CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput 
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.

Bug: 18896770

Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
 2015-01-08 12:51:22 +09:00
Bryce Lee
7c91446769 Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." 
This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8.

Causes NPE on devices without telephony (Android Wear for example)
Bug:18922524

Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
 2015-01-08 02:32:08 +00:00
Deepanshu Gupta
e1d1abc35d am 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev automerge: 03c822a 
* commit '321bf43315ace2f091a54d514dd56902990bec7a':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:54:13 +00:00
Deepanshu Gupta
96cdef7b75 am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev automerge: 33b2de7 
* commit 'f0da92bfda9a7b393cac87436173c1284c7d48be':
  Add missing DateFormat method.
 2015-01-08 01:54:08 +00:00
Deepanshu Gupta
d00d143fbf am f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev automerge: 7e39385 
* commit 'f45420d0bd912de3da9506bbae12a0e4b789bd84':
  Update platform.dir search in tests.
 2015-01-08 01:53:56 +00:00
Deepanshu Gupta
321bf43315 am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 
automerge: 03c822a

* commit '03c822aa585c319fb9cd05f392d8518501cc4f79':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:49:23 +00:00
Deepanshu Gupta
f0da92bfda am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev 
automerge: 33b2de7

* commit '33b2de7f34180983fe596ff9faa6955b032fa157':
  Add missing DateFormat method.
 2015-01-08 01:47:52 +00:00
Deepanshu Gupta
f45420d0bd am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev 
automerge: 7e39385

* commit '7e393853656387757da2531d4e504d7cf32e738e':
  Update platform.dir search in tests.
 2015-01-08 01:46:46 +00:00
Deepanshu Gupta
03c822aa58 am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 
* commit '2d14feb4c7185008111f3a6340f114a4c891e01c':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:38:44 +00:00
Deepanshu Gupta
2d14feb4c7 Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 2015-01-08 01:31:55 +00:00
Deepanshu Gupta
33b2de7f34 am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev 
* commit '169c11dd39ec44364168785a7a83fb747e893c9a':
  Add missing DateFormat method.
 2015-01-08 01:23:35 +00:00
Deepanshu Gupta
7e39385365 am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev 
* commit '565b6b415a18ee0b99af8cb693b980e57136282b':
  Update platform.dir search in tests.
 2015-01-08 01:23:30 +00:00
Deepanshu Gupta
169c11dd39 Merge "Add missing DateFormat method." into lmp-mr1-dev 2015-01-08 01:17:32 +00:00
Deepanshu Gupta
565b6b415a Merge "Update platform.dir search in tests." into lmp-mr1-dev 2015-01-08 01:17:23 +00:00
Jeff Sharkey
6fe380724b am bcba2182: Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 automerge: 387da77 
* commit 'bcba21827c836e8941719b432fbf11d1bb8e8639':
  check ntpserver as empty string instead of null
 2015-01-08 01:11:05 +00:00
Jeff Sharkey
bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
 2015-01-08 01:03:49 +00:00
Jeff Sharkey
387da77697 Merge "check ntpserver as empty string instead of null" 
automerge: dbcb4a1

* commit 'dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
  check ntpserver as empty string instead of null
 2015-01-08 00:59:56 +00:00
Jeff Sharkey
dbcb4a16d4 Merge "check ntpserver as empty string instead of null" 2015-01-08 00:57:43 +00:00
Alan Viverette
4456b81f22 Merge "Add popup window accessors for anchor overlap, gravity, window" 2015-01-08 00:37:17 +00:00
Young-Ho Cha
0eda7dfcac check ntpserver as empty string instead of null 
mServer cannot set null, because string from resource always returns
non-null charsequence

Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
 2015-01-08 09:34:01 +09:00
Deepanshu Gupta
1330f79f95 Replace java.util.LinkedHashMap.eldest() 
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.

Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
 2015-01-07 16:32:21 -08:00
Alan Viverette
16a0c21d98 Merge "API for tinting TextView compound drawables" 2015-01-08 00:32:06 +00:00
Deepanshu Gupta
ec4b131db5 am 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e 
* commit '5df729ad09b85cb68bdf37d58c5d429c2c8663a4':
  Fix tests on jenkins, take 2.
 2015-01-08 00:16:32 +00:00
Joe Fernandez
2e356e4c15 am 04b30fa0: am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957 
* commit '04b30fa00b5ae9c05c307dbfa2ba7d8028402999':
  docs: Update Dashboard for January 2015
 2015-01-08 00:16:28 +00:00
Alan Viverette
b97d69856d API for tinting TextView compound drawables 
BUG: 18762354
Change-Id: Iba6fab4f63a5d26cb27606d25a1fd0a1f47afa57
 2015-01-07 16:16:20 -08:00
Andy Hung
13fd0f400c Merge "Use channelCountFromOutChannelMask in AudioTrack" 2015-01-08 00:11:58 +00:00
Jinsong Mu
095e9cf9f9 Merge "Make talkback or other accessibility services updateable from playstore only when it's been enabled. The idea is to set accessibility services package status to disabled_until_used by default. Change the status to enabled once user turn the service on." 2015-01-08 00:08:23 +00:00
Alan Viverette
2d4c476aca Merge "Fix accessibility delegation" 2015-01-08 00:07:25 +00:00
Alan Viverette
a54956a0bc Fix accessibility delegation 
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
 2015-01-07 16:05:02 -08:00
Deepanshu Gupta
5df729ad09 am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e 
* commit 'a98a9b30bea74478b9d1b3f16e3713f5c864e648':
  Fix tests on jenkins, take 2.
 2015-01-08 00:03:58 +00:00
Joe Fernandez
04b30fa00b am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957 
* commit 'ec5f5934153557e85c1a001e713b963b79d18388':
  docs: Update Dashboard for January 2015
 2015-01-08 00:03:52 +00:00
Deepanshu Gupta
a98a9b30be am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e 
* commit 'd8e99c5861b09de8f709c9284240e2c3115507bb':
  Fix tests on jenkins, take 2.
 2015-01-07 23:57:59 +00:00
Joe Fernandez
ec5f593415 am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957 
* commit '97b7b8637bc50cbcd9ad9a63fcb34355439b0701':
  docs: Update Dashboard for January 2015
 2015-01-07 23:57:54 +00:00