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

211044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
512141d581 Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 2015-09-03 17:06:03 +00:00
Michael Wright
7f7ffa3722 am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '87e4c951bf876faefad9f4223f6a568777425ae7':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:30:27 +00:00
Michael Wright
87e4c951bf am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '59c1a0e1cb6cad46e30821e25f99c1ecce1227f0':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:20:44 +00:00
Michael Wright
59c1a0e1cb am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '8ae90587a510f72a176119b1f23add8bc36285b9':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:10:05 +00:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Lorenzo Colitti
d64144a37c Don't crash on (invalid) hardware address lengths > 127. 
These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi).  This is a bit less liberal than the
legacy client, which doesn't check the length at all.

Bug: 23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
 2015-09-03 21:28:48 +09:00
Yasuhiro Matsuda
25878b2888 Remove unnecessary finally blocks for tracing. 
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
 2015-09-03 16:27:13 +09:00
Jim Miller
9f29c39271 am ac1da481: am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev 
* commit 'ac1da4816b360028eb0185ac984f1ffaa79fdb18':
  Fingerprint should throttle after 5 attempts
 2015-09-03 06:23:31 +00:00
Daniel Estrada Alva
256718bc72 am 7f15432f: am 1afe952c: am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev 
* commit '7f15432fd05e98625bdf6f7ab1bea10491dde655':
  Use private action for SUPL related connectivity changes.
 2015-09-03 06:23:25 +00:00
Daniel Estrada Alva
429b020e61 am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '280b4495bd492f68e955ea8e1649abe832ced974':
  Add SUPL-specific network bcast
 2015-09-03 06:23:10 +00:00
Christopher Tate
46ac9a1666 am a91d4357: am 623def69: am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M 
* commit 'a91d4357c5da515b3901eb5f49f9fd5ed1c7ee8f':
  Apply default link-handling policy at OTA from pre-M
 2015-09-03 06:23:05 +00:00
Jorim Jaggi
d05c6dd38c am b991034d: am ac2b543b: am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev 
* commit 'b991034d3e45276f03f719ba24c98daf65870407':
  Fix wrong mode for fingerprint unlock when bouncer not showing
 2015-09-03 06:22:48 +00:00
Joe LaPenna
523fb533db am bef95e93: (-s ours) am 93e66738: (-s ours) Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE 
* commit 'bef95e93306dc0325218cf880404ffa4f885afe4':
  Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
 2015-09-03 06:22:30 +00:00
Joe LaPenna
2548d3da94 am 97db5d77: am 23d681bb: Device Idle: Android wear support 
* commit '97db5d77fa249c12d026b36fe73682ea84a593d7':
  Device Idle: Android wear support
 2015-09-03 06:22:24 +00:00
Tim Kilbourn
fca744cef6 am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 
* commit '573cdc420b2d7f8d4636a949458a59f1937d62d1':
  Allow shell to disable keyguard when not secure
 2015-09-03 06:22:06 +00:00
Clara Bayarri
3b60f72fba am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
  Fix Custom action mode menu item onclick is not working
 2015-09-03 06:21:25 +00:00
Vineeta Srivastava
62e8020176 am 9051eab5: am 9edfb36a: am dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev 
* commit '9051eab5a0d17b65362c6b8ba6095b581cf2a1c8':
  set config_use_sim_language_file false for KR LGU+/KT
 2015-09-03 06:21:18 +00:00
Joshua Schwarz
78daa6d32d am bade9522: am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev 
* commit 'bade9522cf11141d3bd31ab9d56976a33d05fc64':
  Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
 2015-09-03 06:21:11 +00:00
Roshan Pius
4b26166065 am c4809bcf: am 8750f04a: am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev 
* commit 'c4809bcfa72f2f4eb4f03cb4b86dbb864cc01147':
  Reformat only KR numbers with leading "+82".
 2015-09-03 06:20:53 +00:00
Selim Cinek
9679cb35f6 am 4997cd36: am 9e30e202: am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev 
* commit '4997cd364deeeb03edfe19e9c3959bd694970ec7':
  Fixed a crash in the notification group manager
 2015-09-03 04:24:09 +00:00
Deepanshu Gupta
b3382661eb am ee1eed7e: am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'ee1eed7e711228008dc91a7da800be6527539e87':
  LayoutLib: Fix typedArray caching.
 2015-09-03 04:24:04 +00:00
Jim Miller
2161912ef9 am a32bef01: am 4f7d5dcd: am be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev 
* commit 'a32bef01a2f2ee2448ceefe465cd380e389771ad':
  Only allow foreground app and keyguard to access FingerprintManager
 2015-09-03 04:23:55 +00:00
Filip Gruszczynski
1ae66595c0 am 521ded6e: am dbf8c0d9: am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev 
* commit '521ded6e9dcb9e97843c89f6d7c87264107d4ef7':
  Don't perform layout while adjusting displays/stacks state.
 2015-09-03 04:23:40 +00:00
Eino-Ville Talvala
af5268c965 am cb41a60e: am 7f2b4b6a: am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev 
* commit 'cb41a60ee259ee332eb11e2208c3ae5582ec5aec':
  DO NOT MERGE: Fix DngCreator default crop calculations.
 2015-09-03 04:23:35 +00:00
Selim Cinek
63210491b8 am 260ae8e5: am 3e64c75f: am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 
* commit '260ae8e56c6c3f6acd9290a843f6cfe27cdad6a7':
  Fixed when the notification effects are being cleared
 2015-09-03 04:23:28 +00:00
Jim Miller
9946c255e2 am 444f8d2d: am d050cc87: am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev 
* commit '444f8d2d37144a3cb3966b3ca9118a7242c094e7':
  Fix broken enter key after failed PIN attempts.
 2015-09-03 04:23:13 +00:00
Vineeta Srivastava
62257ab097 am 971f899a: am 53c14ce4: am 860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev 
* commit '971f899ab0ef939bce126ca26d7489799fe4edf8':
  Do not show roaming icon for NL KPN network with Telfort SIM
 2015-09-03 04:23:07 +00:00
Svetoslav
fbc66e9d51 am 42e3c369: am dc436aaa: am 69228600: am fb9ec507: Incorrect app op check in broadcast queue 
* commit '42e3c3696d7c5a6ee6ec4c9fd37289d6e917577a':
  Incorrect app op check in broadcast queue
 2015-09-03 04:22:57 +00:00
Tim Murray
65052ba4fa am e2565aec: am e20eff91: am 3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev 
* commit 'e2565aecca1c56dcf80bb0e88dfddeca25388ad6':
  Enable migration to big cores for app launches.
 2015-09-03 04:22:36 +00:00
Christopher Wiley
0ba44aaa73 am 80a679c4: am b1db04f3: Merge "aidl: Add end to end test" 
* commit '80a679c459d509e31f0f4e1b8accc327a451e0f5':
  aidl: Add end to end test
 2015-09-03 00:39:29 +00:00
Christopher Wiley
c9c2446773 am a3b4fb68: am b14e7b84: Merge "aidl: Remove example test" 
* commit 'a3b4fb6851dc91222863783b7ac6664d62df2c3d':
  aidl: Remove example test
 2015-09-03 00:39:22 +00:00
Christopher Wiley
80a679c459 am b1db04f3: Merge "aidl: Add end to end test" 
* commit 'b1db04f371963cb61bc5df21142a59f77515a62f':
  aidl: Add end to end test
 2015-09-03 00:31:52 +00:00
Christopher Wiley
a3b4fb6851 am b14e7b84: Merge "aidl: Remove example test" 
* commit 'b14e7b84290fa40221e3f315862dd1f79bf21871':
  aidl: Remove example test
 2015-09-03 00:31:45 +00:00
Jim Miller
ac1da4816b am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev 
* commit 'f873f9ab6e2f59ebedbc1542ad780040e539f867':
  Fingerprint should throttle after 5 attempts
 2015-09-02 23:29:07 +00:00
Adrian Roos
e07cbaf53c Show face unlock even when fingerprint is running 
Bug: 23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
 2015-09-02 16:26:34 -07:00
Casey Dahlin
1be040fb7d am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master 
* commit 'b15623cf1c63d33fdd60c6046312c88cda961eb6':
  Delete outdated options tests
 2015-09-02 23:20:40 +00:00
Jim Miller
f873f9ab6e am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev 
* commit 'bd5b61c489fb0543c8db29030e57189c273010eb':
  Fingerprint should throttle after 5 attempts
 2015-09-02 23:19:26 +00:00
Jim Miller
bd5b61c489 Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev 2015-09-02 23:07:58 +00:00
Jim Miller
73633ddbcf Fingerprint should throttle after 5 attempts 
Fixes bug 23762058

Change-Id: I62665dd3097b8e71075a5eddbf34a551db1507d5
 2015-09-02 15:35:33 -07:00
Daniel Estrada Alva
7f15432fd0 am 1afe952c: am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev 
* commit '1afe952ca1964a43d8a1ec3dd69a8ee1b85dba17':
  Use private action for SUPL related connectivity changes.
 2015-09-02 22:19:22 +00:00
Daniel Estrada Alva
1afe952ca1 am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev 
* commit '90738c2a7e85cd07ac2cf3ab61246b7745c8fb80':
  Use private action for SUPL related connectivity changes.
 2015-09-02 22:13:10 +00:00
Daniel Estrada Alva
90738c2a7e Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev 2015-09-02 22:04:30 +00:00
Wale Ogunwale
2cb2dd40d6 Respect DONT_KILL_APP flag when bringing down a disabled service. 
Commit 540e123 introduce logic to clean up states when a component is
disabled. For services this included marking the process running the
service as removed so it can be killed later. However, this wasn't
respecting the Intent.EXTRA_DONT_KILL_APP flag where the caller
doesn't want the process of the disabled component to be killed.
This change now takes the flag into account.

Bug: 23491822
Bug: 15804187
Change-Id: I54a6e03cd66164dc8c4606a3c462114fe661ea8e
 2015-09-02 14:53:29 -07:00
Casey Dahlin
b15623cf1c resolved conflicts for merge of 9483748a to stage-aosp-master 
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
 2015-09-02 14:33:41 -07:00
Daniel Estrada Alva
280b4495bd am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '967c8816e5b32033331deca294708cd3e467c3f2':
  Add SUPL-specific network bcast
 2015-09-02 21:30:37 +00:00
Christopher Tate
a91d4357c5 am 623def69: am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M 
* commit '623def69ef11f95973d93e6dbc2624e814a3adf3':
  Apply default link-handling policy at OTA from pre-M
 2015-09-02 21:30:32 +00:00
Casey Dahlin
1ef20d6221 am bad130ee: am 02bc5488: Merge "Remove RPC interface Type" 
* commit 'bad130eed378891b82250d90aaf207088b4362e2':
  Remove RPC interface Type
 2015-09-02 21:29:59 +00:00
Casey Dahlin
bad130eed3 am 02bc5488: Merge "Remove RPC interface Type" 
* commit '02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
  Remove RPC interface Type
 2015-09-02 21:18:46 +00:00
Daniel Estrada Alva
967c8816e5 am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit 'cfd45ae4718934d403a17410ab6a7c722bdd01fc':
  Add SUPL-specific network bcast
 2015-09-02 21:11:38 +00:00
Christopher Tate
623def69ef am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M 
* commit '7bae31f88f8dcaf8114d9d43b29e154bc23374ad':
  Apply default link-handling policy at OTA from pre-M
 2015-09-02 21:11:34 +00:00