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

196420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order... 
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
 2015-07-06 10:17:24 -07:00
Chris Craik
d3ecb3e6f0 Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev 2015-07-01 18:10:33 +00:00
Makoto Onuki
a10277e3e4 Merge "Allow default SMS app to get self phone number" into mnc-dev 2015-07-01 18:06:38 +00:00
Aravind Akella
ef8d2bba23 Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev 2015-07-01 18:04:44 +00:00
Jay Shrauner
b6045cb8e0 Merge "Catch SecurityExceptions" into mnc-dev 2015-07-01 18:04:37 +00:00
Geoff Mendal
1f9d5a0950 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 17:54:23 +00:00
Rich Slogar
b8388f345c am 48413e6a: am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs 
* commit '48413e6a1134137c7358217c550b2783a7df3a03':
  docs: migration guide link update
 2015-07-01 17:51:23 +00:00
Filip Gruszczynski
81f8cd92fa am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev 
* commit '3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992':
  Build fix after changing IWindowSession.
 2015-07-01 17:51:18 +00:00
Aravind Akella
32207e3c66 Merge "Changes to Data Injection mode APIs" into mnc-dev 2015-07-01 17:39:57 +00:00
Geoff Mendal
5e039e64bd Import translations. DO NOT MERGE 
Change-Id: I1492b302d8c75b2b6c9d5f0a51a65ab8c8d3e848
Auto-generated-cl: translation import
 2015-07-01 12:29:58 -05:00
Luan Nguyen
0794acc557 am a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs 
* commit 'a4ac253bc36bbced5acad8a7ddf1838b11f6e44c':
  docs: Move scale Bitmap code to onSurfaceChanged
 2015-07-01 17:13:03 +00:00
Amit Mahajan
4b2d706155 am 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '45e50f87bb2b2cd11b19ee102223c03356d77042':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-07-01 17:12:53 +00:00
Joe Fernandez
3cc50169fe am f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'f1f720b607ef6150f79095e2dd7ab1e62fc03c10':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-07-01 17:12:45 +00:00
Rich Slogar
d88767da1e am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs 
* commit 'e3d8df63076241a3d3637643e6ff1530bca5a5b2':
  docs: studio workflow page typo
 2015-07-01 17:12:39 +00:00
Robert Schaub
a50979997c am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2':
  docs: Changed link in Java source code comment to repair 404
 2015-07-01 17:12:31 +00:00
Jay Shrauner
6ce5d68a58 Catch SecurityExceptions 
Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
 2015-07-01 10:07:17 -07:00
Filip Gruszczynski
d40c423b1c Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 2015-07-01 17:03:03 +00:00
John Reck
a4ac386d2a Merge "Make querying the graphics stats service more defensive" into mnc-dev 2015-07-01 16:56:09 +00:00
Chris Wren
c58d169530 Merge changes from topic 'tron' into mnc-dev 
* changes:
  remove double count of panel open
  report notification load on panel reveal
 2015-07-01 15:33:32 +00:00
Paul Jensen
e51c46b068 Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev 2015-07-01 14:31:21 +00:00
George Mount
cb23ec418e Merge "Add missing addPauseListener." into mnc-dev 2015-07-01 14:10:11 +00:00
Geoff Mendal
0c53a89ea9 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 13:58:20 +00:00
Geoff Mendal
e9eef64495 Import translations. DO NOT MERGE 
Change-Id: I53dabfe326ba0f15b66ecac3829e6b8f55b33924
Auto-generated-cl: translation import
 2015-07-01 08:50:39 -05:00
Geoff Mendal
4f18c7e0c0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 13:40:44 +00:00
Geoff Mendal
c9b6c1767f Import translations. DO NOT MERGE 
Change-Id: Id27150d5e6b378f1fe9e79eb0ea8b88392b2cd09
Auto-generated-cl: translation import
 2015-07-01 08:38:57 -05:00
Paul Jensen
72a77993bd Merge "Log DNS results for network validation attempts" into mnc-dev 2015-07-01 12:43:15 +00:00
Paul Jensen
35daa43e5d Merge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-dev 2015-07-01 12:42:07 +00:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Miao Wang
8a752abe77 Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev 2015-07-01 05:12:07 +00:00
Ronghua Wu
e0b71b4ef7 Merge "media: clean up the usage of max-supported-instances." into mnc-dev 2015-07-01 04:00:23 +00:00
Svet Ganov
22233b51c3 Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev 2015-07-01 02:32:50 +00:00
Christopher Tate
2438c9b2e7 Merge "Fix dispatch of onRestoreFinished()" into mnc-dev 2015-07-01 01:25:54 +00:00
Aravind Akella
b02e6050bd Fix for last sensor missing from sensor list returned by the HAL. 
Bug: 22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
 2015-06-30 18:02:45 -07:00
Christopher Tate
758de809b9 Fix dispatch of onRestoreFinished() 
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles.  On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.

Bug 22194736

Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
 2015-06-30 17:58:27 -07:00
Chris Craik
df72b63928 Switch from fminf/fmaxf to std::min/max 
bug:22208220

Shows considerable improvement in performance, especially in tight
loops.

Change-Id: I4bcf6584a3c145bfc55e73c9c73dcf6199290b3c
 2015-06-30 17:58:21 -07:00
Svet Ganov
67a461eca8 Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 2015-07-01 00:55:58 +00:00
Yohei Yukawa
63c4a7185c Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 2015-07-01 00:51:36 +00:00
Jeff Sharkey
fc2740ae57 Merge "Hand out storage to more system apps." into mnc-dev 2015-07-01 00:42:44 +00:00
Dianne Hackborn
80abf887a1 Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-01 00:41:46 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Jeff Sharkey
7186dd3a30 Hand out storage to more system apps. 
Grant storage access to the Storage Access Framework provider that
offers to delegate access to storage devices.  Also grant to the
default music app.

Bug: 22104872
Change-Id: I8cf7dceec8b4c1e31f8ddd40b094ccd4ecb1caf8
 2015-06-30 17:32:48 -07:00
Jeff Sharkey
ca2f2feda8 Merge "Fully unmount existing storage in Zygote." into mnc-dev 2015-06-30 23:59:50 +00:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active 
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
 2015-06-30 16:59:41 -07:00
Jorim Jaggi
e4b840d63d Fix overexpand panel motion 
Expanding was already set to false when we decided which QS
overscroll animation to run. We can't change the order of expanding
finished/tracking finished because of another bug. Instead, let the
stack scroller know about tracking state and combine both of them.

Bug: 21705230
Change-Id: I041ff1fabc6c939c233528f9d08d804ead64bbab
 2015-06-30 23:33:00 +00:00
Jorim Jaggi
e4f1a202d8 Fix Keyguard header animation from SHADE_LOCKED -> Keyguard 
Bug: 22128249
Change-Id: I36dbecc41e66922987c1b753d62bde27cb3b17be
 2015-06-30 23:25:33 +00:00
Yohei Yukawa
d1a092218b Reland "Fixed constant window switching on lock screen..." 
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
 2015-06-30 16:22:05 -07:00
ztenghui
c2756505b2 Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev 2015-06-30 23:20:31 +00:00
Adam Lesinski
49a2a6985d Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 2015-06-30 23:16:20 +00:00
Svet Ganov
ffd25bbed1 Rename uses-permission-m to uses-permission-23 
bug:20072113

Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
 2015-06-30 23:06:41 +00:00
Amith Yamasani
2b64ec470c Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev 2015-06-30 23:00:08 +00:00