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

198491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
9b4917a6f8 am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit 'be01800d76ac786a4617e1cecac71c297acf23e4':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 03:05:58 +00:00
Fyodor Kupolov
030f273550 am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '2a37b2fff27c67454a59048c286b2a7e6329eb07':
  Added a note about location permission
 2015-07-24 03:05:53 +00:00
xin He
4a4e06477b am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '13bb68122fae6cded11e576c41a81cd2baffb3f7':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-24 03:05:47 +00:00
Jeff Sharkey
23fdb6355e am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'e87dc6dba58e55c60f387a86468a57a5109a97ac':
  More info to support CTS, fix reconcile bug.
 2015-07-24 03:05:42 +00:00
Jason Monk
c063146fb2 am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '72548325019cc168a5d98fe7de93dc9ee679a4b7':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:05:33 +00:00
Jorim Jaggi
a0d142d942 am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
  Partially fix that beginning of animation is skipped
 2015-07-24 03:05:28 +00:00
Dianne Hackborn
63ff4a77f3 am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '419f2177c8565f80489d00463aea630568251f4d':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 03:05:22 +00:00
Zhentao Sun
f26a9a20ae am c6cd1f9a: Added service that listens for gestures. 
* commit 'c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
  Added service that listens for gestures.
 2015-07-23 19:21:29 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00
Fred Chung
a201140bb4 am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '9478ddfa11a2f16e3234d4c6251fffa0d8527936':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:21:19 +00:00
Dianne Hackborn
d363399b97 am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:21:14 +00:00
Alex Klyubin
b1d68c90f0 am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '568e67a322deb027480fb85e6d4082b78d907d57':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:21:07 +00:00
Wale Ogunwale
1aaf7d6cb9 am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'aecf9ba839d440fb89055bcb8454cf72d0afaf41':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:21:02 +00:00
Kenny Guy
af52ae07ee am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2adcb40d2ce3706543f3e545ce93e9231b94971c':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:20:57 +00:00
Jason Monk
3260194f20 am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1df7e135196ca3c8a6a51a9b741e12782afa039c':
  Fix blank tiles on QS rotate
 2015-07-23 19:20:53 +00:00
Jason Monk
f91bc8709f am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '67091f46fa16537563a6c095a5bd044499bc2ea5':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:20:48 +00:00
Jim Miller
8cc0e80f06 am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '4a31ee0a745e048a2c9c4db1444404373c1d606b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:20:41 +00:00
Svetoslav Ganov
8276a97fce am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '010b53c029eac203c445d81ecfca01c242111365':
  Update permission icons to final versions - framework
 2015-07-23 19:20:37 +00:00
George Mount
c2c3eacb4c am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '27fbd360a8256cf6321da9ba29bab02b3d241aba':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:20:32 +00:00
Jorim Jaggi
fba926118e am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:20:27 +00:00
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00
Alan Viverette
be01800d76 am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-23 19:18:42 +00:00
Fyodor Kupolov
2a37b2fff2 am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
  Added a note about location permission
 2015-07-23 19:18:34 +00:00
xin He
13bb68122f am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '15a45e02c3372ad5deae0a260f782cd3e5a81d58':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-23 19:18:30 +00:00
Jeff Sharkey
e87dc6dba5 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
 2015-07-23 19:18:25 +00:00
Jason Monk
7254832501 am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-23 19:18:20 +00:00
Jorim Jaggi
5091ca9c82 am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit 'ac73f1efea0cb23881571e18e87ffc7f388af7ad':
  Partially fix that beginning of animation is skipped
 2015-07-23 19:18:15 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Zhentao Sun
c6cd1f9a83 Added service that listens for gestures. 
Added the GestureLauncherService that listens for camera launch gesture
and starts the camera app.
OEMs need to specify the sensor type of the camera launch gesture in
their overlays.
In the future, we can add more gesture support in this service.

Change-Id: I0769e7ca71e08bd9159aacf29bdcefd316efd2f0
 2015-07-22 17:42:41 -07:00
Adrian Roos
58adc7ad48 Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 2015-07-22 23:22:42 +00:00
Fred Chung
9478ddfa11 am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'db71828cb7bff983bd758e986b65731cb0a5b2f6':
  Doc change: add note about not exiting on onPause().
 2015-07-22 20:41:41 +00:00
Alan Viverette
9478bf0e6f Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 2015-07-22 20:35:40 +00:00
Fyodor Kupolov
5ef70b02ea Merge "Added a note about location permission" into mnc-dev 2015-07-22 20:27:06 +00:00
Dianne Hackborn
8635041115 am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-22 20:24:30 +00:00
Alex Klyubin
568e67a322 am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'ada70be897fb7541129f1ab1f6faa94a80fca986':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-22 20:24:21 +00:00
Wale Ogunwale
aecf9ba839 am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'ff21279e2cbe0bdd9c41350b7a204cabf9370377':
  Fixed issue with not finding existing activity for background user
 2015-07-22 20:24:10 +00:00
Kenny Guy
2adcb40d2c am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.
 2015-07-22 20:24:05 +00:00
Jason Monk
1df7e13519 am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
 2015-07-22 20:24:00 +00:00
Jason Monk
67091f46fa am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
 2015-07-22 20:23:55 +00:00
Jim Miller
4a31ee0a74 am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-22 20:23:41 +00:00
Svetoslav Ganov
010b53c029 am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'bdb7d936512a39b6c06411d11a26824b82e5727f':
  Update permission icons to final versions - framework
 2015-07-22 20:23:28 +00:00
George Mount
27fbd360a8 am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-22 20:23:02 +00:00
Jorim Jaggi
fcf9acb95a am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
 2015-07-22 20:22:56 +00:00
xin He
15a45e02c3 Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 2015-07-22 19:47:53 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Alan Viverette
5b39ec8b40 Fix handling of RelativeLayout measurement using UNSPECIFIED spec 
Bug: 22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
 2015-07-22 15:37:14 -04:00
Jason Monk
4fc1b70744 Merge changes from topic 'TunerLoc' into mnc-dev 
* changes:
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-22 19:29:59 +00:00
Jorim Jaggi
ac73f1efea Partially fix that beginning of animation is skipped 
When waiting for all the windows that belong to an activity, we
skipped the main window, in case it didn't had a surface yet. This
was a problem because with SurfaceViews: They set it's visibility
extremely early in the app visibility change cycle. Then, they don't
block with the callback to SurfaceHolder.Callback2.surfaceRedrawNeeded,
so window manager thinks it has drawn the first frame already. We don't
even have a surface for the main window yet, but we start the app
transition already because we think the only interesting window for this
app token is the SurfaceView, which has supposedly already drawn.

Bug: 22207948
Change-Id: I2ddb274000fa08866e193f4fd8db3788fc55e0f1
 2015-07-22 19:21:44 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev 
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
 2015-07-22 12:00:56 -07:00