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

217321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
18eb3c9ccc Remove unused WMS.mBatteryStats. 
Change-Id: I0ff684287ac27d77c6ca778b7b30666969c739aa
 2015-09-03 17:03:05 -07:00
Andre Eisenbach
1d5e2e291d Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 2015-09-04 00:02:57 +00:00
Filip Gruszczynski
ed76be0caa Merge "Fix fitWithinBounds to actually apply stack bounds." 2015-09-03 23:02:41 +00:00
Wale Ogunwale
2fd7cc5ba5 Merge "Ignore empty locale list when diffing Configuration objects" 2015-09-03 22:55:41 +00:00
Andre Eisenbach
7be83c578c Bluetooth: Fix profile auto-connect logic 
The fix in commit 05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.

This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.

Bug: 22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
 2015-09-03 15:20:09 -07:00
Dan Stoza
4a90942ea7 am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit 'f615872cb49062de9113c7c5be31d3b1d1b423af':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-03 22:13:31 +00:00
Filip Gruszczynski
aff7f134a2 Fix fitWithinBounds to actually apply stack bounds. 
Bug: 23749629
Change-Id: Idfca4a83647c3a70c954caeca70d73aa9deee38b
 2015-09-03 15:10:47 -07:00
Wale Ogunwale
b1a4bf2c4b Ignore empty locale list when diffing Configuration objects 
b46fdd4 introduced the concept of locale list to Configuration objects.
However, the change alway returned a locale difference when the delta
object locale list is set to the defualt (empty). We now don't return
a difference if the delta object as an empty locale list which is
consistent with what we did before the change and in line with how we
diff other configuration fields.

Bug: 23744091
Change-Id: I8c2c39d9a7e91e6a3a283312b745c4fdf6874396
 2015-09-03 15:08:51 -07:00
Adrian Roos
c0c140a136 am 5b92de04: am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '5b92de04b7ff9954a50e54a86f11443a904fa547':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 22:06:08 +00:00
Dan Stoza
f615872cb4 am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit '0b887e579b766012c09626e7089a3fade5415ee6':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-03 22:03:08 +00:00
Adrian Roos
0e22872666 resolved conflicts for merge of 123fb19d to master 
Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35
 2015-09-03 15:02:49 -07:00
Dan Stoza
0b887e579b Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 2015-09-03 21:55:36 +00:00
Amit Mahajan
ff751bed7c am 2f142ab0: am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev 
* commit '2f142ab0779c9e36c6f733d7e2e0be083f7172ac':
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-03 21:50:00 +00:00
Amit Mahajan
2f142ab077 am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev 
* commit '8a670f1da434c4720b08dbb62c635316e593b9b3':
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-03 21:39:52 +00:00
Alan Viverette
a0a4f474c8 Merge "Minor clean up in ActivityThread, mostly final usage" 2015-09-03 21:39:26 +00:00
Alan Viverette
f22e290e2f Merge "Postpone loading app context until instrumentation is set up" 2015-09-03 21:39:07 +00:00
Amit Mahajan
8a670f1da4 Merge changes from topic 'TDSCDMA support' into mnc-dr-dev 
* changes:
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-03 21:24:46 +00:00
Sharvil Nanavati
80770c0991 am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev 
* commit '16db4101829c7beee42a09fcaf87fa4e31bc1d5a':
  DO NOT MERGE Add 'bluetooth' user to the 'system' group.
 2015-09-03 21:12:33 +00:00
Sharvil Nanavati
16db410182 Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev 2015-09-03 21:02:43 +00:00
Dan Stoza
904f485bc6 SurfaceControl: Add colorTransform to DisplayInfo 
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
 2015-09-03 13:38:39 -07:00
Adrian Roos
5b92de04b7 am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 20:07:30 +00:00
Adrian Roos
123fb19dd1 am 95179ad4: am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '95179ad4be0377dd9fd35818145f705bcded0d28':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 20:07:25 +00:00
Adrian Roos
6bd2f87ee4 am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit 'bd2ad550c5a7c7b7efbe3510f212322fb173b06c':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 19:58:08 +00:00
Adrian Roos
95179ad4be am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 19:57:58 +00:00
Adrian Roos
bd2ad550c5 am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '34411e8fecab310a0402bd77e8fe5a5a488a783a':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 19:46:45 +00:00
Adrian Roos
54ceea195b am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '95200e6f4eb34818ac0b652167cffacfcfb4fdff':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 19:46:41 +00:00
Adrian Roos
34411e8fec Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev 2015-09-03 19:42:39 +00:00
Adrian Roos
95200e6f4e Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 2015-09-03 19:41:22 +00:00
Adrian Roos
1fa723d8ab am 40087027: am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '4008702700b9e14c756d453deb3bdfaff9138e92':
  Show face unlock even when fingerprint is running
 2015-09-03 19:40:18 +00:00
Adrian Roos
af4ab3e2d3 Don't disable fingerprint when entering wrong credential 
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
 2015-09-03 12:34:12 -07:00
Adrian Roos
f6d51acec6 Poke fingerprint timeout when vold password is correct 
Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
 2015-09-03 12:34:11 -07:00
Adrian Roos
4008702700 am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '4eb81345da21efc2b9731cb1969704081064690c':
  Show face unlock even when fingerprint is running
 2015-09-03 19:29:42 +00:00
Adrian Roos
4eb81345da am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit 'b90f1de216ec8be27eebd17b5f3c6a87ee084e75':
  Show face unlock even when fingerprint is running
 2015-09-03 19:17:36 +00:00
Adrian Roos
b90f1de216 am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52':
  Show face unlock even when fingerprint is running
 2015-09-03 19:08:53 +00:00
Adrian Roos
1b5cc3a4ba Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 2015-09-03 18:59:37 +00:00
Alan Viverette
be64eae333 Minor clean up in ActivityThread, mostly final usage 
Change-Id: Ic98103cb8b2ac6fb9b37fc9457366ded2bfbb7a8
 2015-09-03 14:56:04 -04:00
Alan Viverette
2107d69d35 Postpone loading app context until instrumentation is set up 
The application context needs instrumentation data to be in place
prior to construction so that the class loader is initialized using
the correct paths.

Removes unnecessary clearClassLoader() workaround that was previously
added to fix instrumentation tests.

Bug: 22627299
Change-Id: Ibf8e69e037189a9a563f0b68cfe333461726b71d
 2015-09-03 14:55:27 -04:00
Ian Pedowitz
988f378587 am 7b0f661d: am 1635e818: am cb92577a: am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit '7b0f661d405a1c53067ec104a6c6ddd7abbae1e6':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 18:52:14 +00:00
Svetoslav Ganov
16b43e43f9 am e4428808: am 8fddbc44: am a5cd5d87: am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit 'e4428808bf4d26cbfdef1a6f19f2c9a794442a9b':
  Don't drop runtime permissions on older system app update.
 2015-09-03 18:52:07 +00:00
Wale Ogunwale
0b65a9079e am c2f9e432: am 68025995: am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit 'c2f9e4323cda3090cfa9197eb402f9279a72b224':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 18:52:00 +00:00
Ian Pedowitz
7b0f661d40 am 1635e818: am cb92577a: am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit '1635e8182ad51c1085e608dea6d9ef470747f759':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 18:42:49 +00:00
Svetoslav Ganov
e4428808bf am 8fddbc44: am a5cd5d87: am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit '8fddbc44b0f97b88839fb438d2b96b348547da96':
  Don't drop runtime permissions on older system app update.
 2015-09-03 18:42:44 +00:00
Wale Ogunwale
c2f9e4323c am 68025995: am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit '68025995632d2f4dc8e3fd9e7d518868c72d9e82':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 18:42:38 +00:00
Doris Liu
2140c5490b Merge "Check whether AnimationDrawable is one shot only when visibility changes" 2015-09-03 18:36:17 +00:00
Ian Pedowitz
1635e8182a am cb92577a: am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit 'cb92577aa6201abbba2d2f17c8cc8d99d9754e8b':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 18:31:12 +00:00
Svetoslav Ganov
8fddbc44b0 am a5cd5d87: am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit 'a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb':
  Don't drop runtime permissions on older system app update.
 2015-09-03 18:31:06 +00:00
Wale Ogunwale
6802599563 am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit '1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 18:31:00 +00:00
Ian Pedowitz
cb92577aa6 am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit '7d223aeef8c9108210e0d13e9458b4d701781ee0':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 18:14:49 +00:00
Svetoslav Ganov
a5cd5d8756 am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit '0b5162c85f01f8451120e7ad82aa7193850862f7':
  Don't drop runtime permissions on older system app update.
 2015-09-03 18:14:17 +00:00
Wale Ogunwale
1942f8a72d am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit 'd4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 18:14:13 +00:00