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

202801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
909990d641 am 34aed56d: am 2d8282ae: am ec951af5: am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '34aed56d456c3f64663897fc64cb3c122d19c6af':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 22:44:14 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface. 
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 15:38:07 -07:00
Vineeta Srivastava
99b8820fd7 Use fingerid 0 when checking failed attempts. 
It is valid to have finger id as Hex value which is not necessarily less than 0.
Always compare with finger id 0 to make sure we are not locking out user.

Bug: 22354158
Change-Id: I19ded12ae4ee335621fd278163c652fc154be6cf
 2015-07-08 22:36:15 +00:00
Roshan Pius
f4ca7f9895 am 32aeade4: am f08a7ada: am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev 
* commit '32aeade4d654b271d7d9bb905bca55a1282aa133':
  Change sequence of call removal from Phone's db.
 2015-07-08 22:30:38 +00:00
Jorim Jaggi
acfff97c3c am 91a4079f: am b0ca5026: am 6d712e06: Remove volume motion delay 
* commit '91a4079fbecd0d3edcb2a837087d2b20d844d202':
  Remove volume motion delay
 2015-07-08 22:30:32 +00:00
Jeff Sharkey
093be69c41 am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit 'f3d731620bf5a77ed438a3a7d4329b7a205376f0':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:30:26 +00:00
Jeff Sharkey
e232afca82 am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit '95661575a058f72ec6db5f455b6319816334a5ee':
  Generate stable MTP storage IDs.
 2015-07-08 22:30:20 +00:00
David Friedman
34aed56d45 am 2d8282ae: am ec951af5: am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '2d8282aeef4e6fa9855cffe88ede1d8309d1e0fa':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 22:30:14 +00:00
Robert Greenwalt
49c843d59a am 0b706595: am cf9f1db3: am 8e7b1954: am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 
* commit '0b7065955cbbe042e3a1f4aea1cdcd1116c310ed':
  Add/Fix Permission check on SubscriptionManager.
 2015-07-08 22:22:30 +00:00
Roshan Pius
32aeade4d6 am f08a7ada: am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev 
* commit 'f08a7ada3aaeb2cb167609f50fa77217e12243f7':
  Change sequence of call removal from Phone's db.
 2015-07-08 22:15:25 +00:00
Jorim Jaggi
91a4079fbe am b0ca5026: am 6d712e06: Remove volume motion delay 
* commit 'b0ca50264552c5451be6cf012422587ab612ecd2':
  Remove volume motion delay
 2015-07-08 22:15:17 +00:00
Jeff Sharkey
f3d731620b am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit '46552cfff17d2ca57811e2216dc03a323dcded49':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:15:12 +00:00
Jeff Sharkey
95661575a0 am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit '612aac4e50700ee5ab116318e0475080b2764e4d':
  Generate stable MTP storage IDs.
 2015-07-08 22:15:08 +00:00
David Friedman
2d8282aeef am ec951af5: am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit 'ec951af550a4fb33da63dac66dac29737e4ad490':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 22:15:04 +00:00
Roshan Pius
f08a7ada3a am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev 
* commit '8f596907a5241badad821a6d3490eb2cd7dd23c5':
  Change sequence of call removal from Phone's db.
 2015-07-08 22:08:46 +00:00
Jorim Jaggi
b0ca502645 am 6d712e06: Remove volume motion delay 
* commit '6d712e06f7c35d4120ce8ded5961d3bb97c44cab':
  Remove volume motion delay
 2015-07-08 22:08:38 +00:00
Robert Greenwalt
0b7065955c am cf9f1db3: am 8e7b1954: am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 
* commit 'cf9f1db31d9f15a571f91e28b09375d44cd881d7':
  Add/Fix Permission check on SubscriptionManager.
 2015-07-08 22:08:36 +00:00
Adrian Roos
5d3fad8494 am c18935ec: am 2f5ed2d2: am 4a94dca1: am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev 
* commit 'c18935ecb1298c8c9a6b8204ac960ade8a4d7dec':
  Dump internal state of ImageWallpaper
 2015-07-08 22:03:26 +00:00
Roshan Pius
8f596907a5 Merge "Change sequence of call removal from Phone's db." into mnc-dev 2015-07-08 22:03:25 +00:00
Jeff Sharkey
46552cfff1 am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit '9d587a97b9cf89f85d1782a6af66bff487568945':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:01:32 +00:00
Jeff Sharkey
612aac4e50 am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.
 2015-07-08 22:01:28 +00:00
David Friedman
ec951af550 am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '2a33526b70fbf471b89451b2c2b4553efc286698':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 22:01:24 +00:00
Jorim Jaggi
6d712e06f7 Remove volume motion delay 
Disable window animations, so we can start the show animation directly.

Bug: 21335976
Change-Id: I1d25d0ce46b9a068efed0a1561051072cda226a9
 2015-07-08 21:57:14 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev 
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 21:55:54 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Robert Greenwalt
cf9f1db31d am 8e7b1954: am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 
* commit '8e7b195474788c4624de7565b7c6514f8119467f':
  Add/Fix Permission check on SubscriptionManager.
 2015-07-08 21:52:58 +00:00
Roshan Pius
1ca6207a1e Change sequence of call removal from Phone's db. 
Since the Call API's callbacks are now fired from handlers, they end up
changing the order in which the callbacks from the Phone and Call API's
are fired. To preserve the below ordering, we move the call removal from
Phone's db to after all the onCallDestoryedcallbacks have executed.
1. Call->onStateChanged
2. Call->onDetailsChanged
3. Call->onCallDestroyed
4. Phone->onCallRemoved

BUG: 22127504
Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
 2015-07-08 14:47:36 -07:00
David Friedman
2a33526b70 am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '9568a412377eb5ef247f843c1845b433eb648645':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 21:46:25 +00:00
Adrian Roos
c18935ecb1 am 2f5ed2d2: am 4a94dca1: am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev 
* commit '2f5ed2d242cb3b74fe11c8ac3f0ed879cff1f0bd':
  Dump internal state of ImageWallpaper
 2015-07-08 21:45:28 +00:00
Robert Greenwalt
8e7b195474 am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 
* commit '8b0f3873a04103f6886fdc2fb79b9a3963567720':
  Add/Fix Permission check on SubscriptionManager.
 2015-07-08 21:41:06 +00:00
David Friedman
9568a41237 am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '3d52c10e217c4a622b5e7c0767a46ab5d14e58ea':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 21:33:35 +00:00
Chien-Yu Chen
361d5203db am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit 'c8984961604cdcf0e2744d461e08c32bdf6918ab':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:31:34 +00:00
Adrian Roos
2f5ed2d242 am 4a94dca1: am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev 
* commit '4a94dca13abb7c072f57cd9b9d698f22c7f19d09':
  Dump internal state of ImageWallpaper
 2015-07-08 21:30:04 +00:00
Robert Greenwalt
8b0f3873a0 Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 2015-07-08 21:26:17 +00:00
Wale Ogunwale
bef8a3e393 Finish already paused activity if it should be finished after pausing 
If the app requests its activity to be finished allow it to be finished
immediately if the activity is already paused.

Bug: 22170595
Change-Id: I1ecc0d5f3b85fd80cbe8cdc1d4e32d5c6a50b20c
 2015-07-08 14:19:44 -07:00
Adrian Roos
4a94dca13a am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev 
* commit '7f806ec2288df739a0ec03a2363cc912ad49f443':
  Dump internal state of ImageWallpaper
 2015-07-08 21:16:42 +00:00
Chien-Yu Chen
c898496160 am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '73d7cfea9359ad69bc4b39a348a03f6f34dd1fac':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:16:06 +00:00
Jeff Sharkey
14cbe52150 Kill MediaProvider during drastic changes. 
Sadly MediaProvider makes a ton of assumptions about storage paths
not changing.  To ensure that it picks up radical storage changes,
kill it and let it restart to pick up new paths.

Also give ourselves a longer timeout when benchmarking.

Bug: 20275423
Change-Id: I9971c4667dabdc685cb23528443f085f152c461d
 2015-07-08 14:06:40 -07:00
Tingting Wang
b8fb1343c3 am 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '79f44602a4cae17f262b024c9349c04d8dbcc5cf':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 21:02:21 +00:00
Chien-Yu Chen
73d7cfea93 am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit 'be0a7a0d02099af42e982f8370bc81dad612e91b':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:01:58 +00:00
Adrian Roos
7f806ec228 Merge "Dump internal state of ImageWallpaper" into mnc-dev 2015-07-08 21:01:27 +00:00
Chien-Yu Chen
be0a7a0d02 am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 20:47:16 +00:00
Tingting Wang
79f44602a4 am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit 'eeb5b9d06e6ddb83749771a497e03547851d0ea0':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 20:47:05 +00:00
Tingting Wang
eeb5b9d06e am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '0f4595afd0d9b529fa2464085f526b1d9edd73aa':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 20:35:01 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
Alex Klyubin
28fd11c610 am ab910eb9: am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 
* commit 'ab910eb92029da2828f2ccd1165da0ea73c0c224':
  Reject AlgorithmParameters of wrong type.
 2015-07-08 20:24:20 +00:00
Tingting Wang
0f4595afd0 am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 20:20:20 +00:00
David Friedman
3d52c10e21 Docs: Adds fugu system-image links and hashes for M-Preview. 
This is for English and non-English pages, alike.

Change-Id: I6ad68cee7d416279a5db0a39192fdca14f1f3709
 2015-07-08 13:10:47 -07:00
Alex Klyubin
ab910eb920 am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 
* commit 'f2d70428543727e0c6031e33ce4445ad9589ef6f':
  Reject AlgorithmParameters of wrong type.
 2015-07-08 20:09:12 +00:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00