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

172989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
2d26435f0e am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit 'bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 15:16:07 +00:00
Christoph Studer
b018399a3a SysUI: Log lockscreen gestures 
Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
 2015-01-14 15:15:58 +00:00
Jorim Jaggi
86e1788db4 Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 2015-01-14 15:13:09 +00:00
Christoph Studer
bd0db7b18f Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 2015-01-14 15:10:53 +00:00
Nicolas Prevot
206d31f598 am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 13:38:21 +00:00
Nicolas Prevot
42ebaa434f Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 2015-01-14 13:33:13 +00:00
Paul Jensen
be61ffa4fe am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 
* commit '9f0e9ad40633f0480c8b6209e52d61c5aac52d1d':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
 2015-01-14 12:42:32 +00:00
Paul Jensen
9f0e9ad406 Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 2015-01-14 12:39:01 +00:00
Lorenzo Colitti
51d281ee41 am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '792fd3d1eea0d4e1c69480684cf3be4e4c215ace':
  Switch the connectivity check to its own hostname.
 2015-01-14 12:06:31 +00:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
 2015-01-14 12:06:22 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
 2015-01-14 11:59:46 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
 2015-01-14 11:59:41 +00:00
Nicolas Prevot
2c1c5dd5ef Make documentation for cross-profile intent filters clearer. 
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
 2015-01-14 10:31:23 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Chad Brubaker
7a2c973db7 Generate IKeystoreService using aidl 
This replaces IKeystoreService.java with IKeystoreService.aidl and
changes the methods that passed down a byte[][] to instead pass down a
KeystoreArguments which is currently a thin parcelable wrapper around a byte[][].

Change-Id: I6367bcf57562f41a27aab14f1903b74995cb65c2
 2015-01-13 18:29:15 -08:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Junda Liu
427e7162ca am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:17:58 +00:00
Junda Liu
ead0184548 am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit '6e41019633975358cf2f84c5d1e09e6e3a049875':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:09:53 +00:00
Junda Liu
6e41019633 Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 2015-01-14 00:06:19 +00:00
Justin Harrison
4a7b0062a1 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 
automerge: 561cf95

* commit '561cf9595547581e0cc905ed5a05023bf67ca0b8':
  Fix unexpected language changes on SIM card insertion.
 2015-01-13 23:26:23 +00:00
Eric Laurent
e5a25a7689 am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 
automerge: 50085fb

* commit '50085fbccfd08038ba5ec888621d960dbbe21405':
  AudioService: handle stream mute by stream alias
 2015-01-13 23:25:05 +00:00
Stuart Scott
2d68b428b0 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:23:20 +00:00
Fyodor Kupolov
f8db59de22 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 
automerge: 562e87b

* commit '562e87bdd5eb58a97cce2224c36443f8915fa7d8':
  Run isKeyguardSecure under system privileges
 2015-01-13 23:21:43 +00:00
Justin Harrison
561cf95955 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 
* commit '820088587e732fe04b705248a06f275bf264be33':
  Fix unexpected language changes on SIM card insertion.
 2015-01-13 23:15:14 +00:00
Eric Laurent
50085fbccf am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 
* commit 'ad58ca67c6e3a999357f0d4df8daa9fbbe1a2903':
  AudioService: handle stream mute by stream alias
 2015-01-13 23:15:09 +00:00
Stuart Scott
dfb99e8274 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
* commit 'e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:15:03 +00:00
Fyodor Kupolov
562e87bdd5 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 
* commit '207d7bd3a4aca3478910ec740a0c810868fbeabb':
  Run isKeyguardSecure under system privileges
 2015-01-13 23:14:58 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname. 
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
 2015-01-14 08:06:56 +09:00
Justin Harrison
820088587e Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 2015-01-13 23:01:39 +00:00
Eric Laurent
ad58ca67c6 Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 2015-01-13 23:00:40 +00:00
Stuart Scott
e3b0449b0f Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 2015-01-13 22:43:14 +00:00
Wink Saville
54b1b1a07a StateMachine.dump produces no output sometimes. 
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
 2015-01-13 22:35:25 +00:00
Fyodor Kupolov
207d7bd3a4 Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 2015-01-13 22:19:26 +00:00
Junda Liu
3fb3abd10a Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council. 
Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
 2015-01-13 14:11:11 -08:00
Craig Mautner
1549346a98 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 
automerge: 82da2ee

* commit '82da2ee927a86114f583b2ea8683076069e761e0':
  Complete booting when frontmost activity is idle
 2015-01-13 22:05:27 +00:00
Craig Mautner
9d82182f0c am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
automerge: 0f6da47

* commit '0f6da477cbf3232996770a17910d3e44a0b893ac':
  Add debug for ANR
 2015-01-13 22:03:04 +00:00
Craig Mautner
82da2ee927 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 
* commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
  Complete booting when frontmost activity is idle
 2015-01-13 21:34:32 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
 2015-01-13 21:34:27 +00:00
Craig Mautner
ef04ae79af Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 2015-01-13 21:28:37 +00:00
Craig Mautner
31ae17309e Merge "Add debug for ANR" into lmp-mr1-dev 2015-01-13 21:27:23 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR 
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
 2015-01-13 13:24:17 -08:00
Tyler Gunn
c7105c4600 am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
* commit '0e5b3d4eabfa747bab39117d512d6218b8fa7783':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 20:58:12 +00:00
Greg Hackmann
b5af40f040 am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e 
* commit '96f7ac84b51c3ceb913e78275e99e2f4f79ebe86':
  Find wall clock RTC through sysfs
 2015-01-13 20:53:06 +00:00
Greg Hackmann
96f7ac84b5 Merge "Find wall clock RTC through sysfs" 
automerge: 41ef80e

* commit '41ef80e7ff739d863ea5df0e129e54f953545212':
  Find wall clock RTC through sysfs
 2015-01-13 20:47:34 +00:00
Tyler Gunn
0e5b3d4eab am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
* commit 'a27523e3e0fd6c6cab18255151f2f9ec9a72f3d6':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 20:47:18 +00:00
Jorim Jaggi
01ba98b856 Only notify SIM state changes when it has actually changed 
onSubscriptionInfoChanged gets called quite frequently whenever
something about the connectivity changes, which could lead that the
whole state of the Keyguard was reset. This change actually checks
whether the state has really changed and thus only resets Keyguard
when necessary.

Bug: 18821582
Change-Id: Ia70804d0337b11914c7d57aa4cdc47d585786f1d
 2015-01-13 21:46:43 +01:00
Greg Hackmann
41ef80e7ff Merge "Find wall clock RTC through sysfs" 2015-01-13 20:43:36 +00:00
Tyler Gunn
a27523e3e0 Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 2015-01-13 20:42:37 +00:00
Stuart Scott
4abdd07949 Update javadoc and hide getNameSource and getDataRoaming. 
Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
 2015-01-13 12:31:04 -08:00
Eric Laurent
4fb3b60215 AudioService: handle stream mute by stream alias 
Handle stream mute/unmute requests at the stream
alias level (like is done volume changes) to be consistent.
E.g a request to mute/unmute a stream will affect all streams
sharing the same alias for volume management.

Bug: 18844550.
Change-Id: Ie2e463c58df0371589150f0ebb9b36c38b14e1be
 2015-01-13 12:19:53 -08:00