Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,510 Commits 3 Branches 0 Tags
ac5f66e32efd43801c314114bfff28668f598a4d
Commit Graph

199510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
ac5f66e32e am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'bf01932797aa5ae8d94643b7861b45c89364b2ba':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-27 01:42:18 +00:00
Deepanshu Gupta
8affffc782 am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit 'ef284578ee3b77890bcb45bbd1f89a5d244bced1':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-27 01:42:13 +00:00
Deepanshu Gupta
bf01932797 am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-27 01:27:52 +00:00
Deepanshu Gupta
ef284578ee am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '78d77bc379f42dfe020cf0719ceae14174cf1c33':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-27 01:27:45 +00:00
Tim Kilbourn
487cdebd90 am 8f1ea834: Handle the -a flag for dumpsys appops. 
* commit '8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
  Handle the -a flag for dumpsys appops.
 2015-08-27 01:15:58 +00:00
Tim Kilbourn
8f1ea834f9 Handle the -a flag for dumpsys appops. 
Bug: 23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
 2015-08-26 15:07:37 -07:00
Roshan Pius
6ad123156e Merge "Reformat local Korean numbers in national format." into mnc-dr-dev 2015-08-26 21:15:16 +00:00
Daniel Estrada Alva
47ee2ecf82 Merge "Disable AR HW when client binder dies." into mnc-dr-dev 2015-08-26 21:09:50 +00:00
Alan Viverette
b9b57225c2 am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev 
* commit '9513785715e2325ee3a3269fbfe7b1f4409eff5c':
  Avoid NPE when getPositionForView() is called on detached view
 2015-08-26 20:45:26 +00:00
Alan Viverette
9513785715 Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev 2015-08-26 20:38:53 +00:00
Deepanshu Gupta
b44f7fda75 am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 20:17:40 +00:00
Deepanshu Gupta
78d77bc379 am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit 'bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 20:17:34 +00:00
Alan Viverette
898c7045e0 Avoid NPE when getPositionForView() is called on detached view 
Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
 2015-08-26 15:22:09 -04:00
Chien-Yu Chen
fd059b34fa am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev 
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
  Camera: Update for reprocess session
 2015-08-26 19:07:52 +00:00
Chien-Yu Chen
e4c3ff2f50 Merge "Camera: Update for reprocess session" into mnc-dev 2015-08-26 18:56:15 +00:00
Nicholas Sauer
59af87c2b6 am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev 
* commit '7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
  Add GET_APP_OPS_STATS to Shell
 2015-08-26 18:25:26 +00:00
Selim Cinek
e67268e66d Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev 2015-08-26 18:25:07 +00:00
Nicholas Sauer
7c17ec5fa5 Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev 2015-08-26 18:17:03 +00:00
Daniel Estrada Alva
8ff73b596e Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev 2015-08-26 17:30:09 +00:00
Selim Cinek
a07177f0ad Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev 2015-08-26 17:20:50 +00:00
Selim Cinek
69ff8afcee Migrate camera vibration to the systemUI 
Also make sure the device is awake before vibrating.

Bug: 23200352
Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
 2015-08-26 10:12:19 -07:00
Selim Cinek
372d1bdd54 Launching the camera now from systemUI including animations 
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.

Bug: 22957192
Bug: 22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
 2015-08-26 10:12:06 -07:00
Roshan Pius
672b2cc05c Reformat local Korean numbers in national format. 
Korean carriers don't want the country codes displayed for local calls.
However the network returns the entire phone number including the
country code for Volte calls. According to the Koean phone numbering
scheme (https://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea),
we need to replace the country code +82 with a 0 prepended to the
carrier code to format it as a national number.

BUG: 22862845
Change-Id: Ifbb9eb8d5379608b4ea9d95ae7744779340b188e
 2015-08-26 10:00:49 -07:00
Geoff Mendal
a67f961f4f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-26 16:18:32 +00:00
Geoff Mendal
41abd08541 Import translations. DO NOT MERGE 
Change-Id: Ia70a231f9cb167baec336984d4531137c833b48f
Auto-generated-cl: translation import
 2015-08-26 11:10:31 -05:00
Michael Wright
09952195f8 Merge "Update rotation without holding the WOL lock." into mnc-dr-dev 2015-08-26 13:08:25 +00:00
Deepanshu Gupta
0a07bb95a1 am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'aa72988955789be6e790c344daba3ef17abfcd98':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 05:54:28 +00:00
Deepanshu Gupta
bbbdc2ad89 am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 05:54:23 +00:00
Adrian Roos
d56892da19 Merge "Disable fingerprint after user lockout" into mnc-dr-dev 2015-08-26 00:43:31 +00:00
Todd Kennedy
81d0325ffe am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev 
* commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
  Allow extra slop in battery stats
 2015-08-26 00:35:42 +00:00
Todd Kennedy
5983ae7b98 Merge "Allow extra slop in battery stats" into mnc-dev 2015-08-26 00:27:46 +00:00
Todd Kennedy
590da11a85 Allow extra slop in battery stats 
Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop
to 750ms.

Bug: 23391894
Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
 2015-08-25 17:27:03 -07:00
Chris Tate
9b7a4ac584 am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev 
* commit 'e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc':
  Teach Pm about the "always ask" link-handling state
 2015-08-26 00:20:50 +00:00
Chris Tate
e62421f1fb Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev 2015-08-26 00:10:23 +00:00
Raph Levien
f03c090f3e am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 
* commit '8304c6c0f9d4b8624ab9cf5cfe5dce15db64c4de':
  Truncate and ellipsize app name if too long for dialog.
 2015-08-25 23:35:37 +00:00
Raph Levien
8304c6c0f9 Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 2015-08-25 23:25:10 +00:00
Jim Miller
01c5bf5470 Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev 2015-08-25 23:22:29 +00:00
Adrian Roos
873010dfee Disable fingerprint after user lockout 
Bug: 22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
 2015-08-25 15:59:00 -07:00
Jorim Jaggi
e30e8980a1 Merge "Disable RT animations for header ripple" into mnc-dr-dev 2015-08-25 22:54:34 +00:00
Michael Wright
58950a9476 Truncate and ellipsize app name if too long for dialog. 
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
 2015-08-25 23:12:34 +01:00
Michael Wright
74f6c79b51 Update rotation without holding the WOL lock. 
We need to make sure to only ever update the orientation of the
device from WindowOrientationListener when we're not holding the WOL
class lock, otherwise we can deadlock when WMS calls into us to set
the orientation based on an apps preference.

Bug: 23491348
Change-Id: Ifeded4d5d1dc923fa2ce0473bc4b7fe950dc0cfd
 2015-08-25 21:15:12 +01:00
Christopher Tate
47dd08d7fb Teach Pm about the "always ask" link-handling state 
Bug 23511867

Change-Id: I74b3c8222a7d22541a96b698edd1a175d378e48f
 2015-08-25 12:39:04 -07:00
Deepanshu Gupta
aa72988955 Don't keep LayoutlibCallback reference. [DO NOT MERGE] 
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51d)
 2015-08-25 12:06:41 -07:00
Deepanshu Gupta
5c90c4f459 Remove kxml dependency [DO NOT MERGE] 
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af255846)
 2015-08-25 12:06:30 -07:00
Chien-Yu Chen
e90c6d0ad2 Camera: Update for reprocess session 
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.

Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
 2015-08-25 11:58:21 -07:00
Nicolas Prevot
26b555d42c am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. 
* commit 'd34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
  Don't set a null filter to a cross-profile ResolveInfo.
 2015-08-25 17:39:24 +00:00
Nicholas Sauer
1344cb9b1b Add GET_APP_OPS_STATS to Shell 
bug: 23397072
Change-Id: I9f60f175380048e0f3888d866069f8f76166c732
 2015-08-25 08:47:50 -07:00
Chris Wren
83d83194c3 Merge "instrument fingerprint crypto token service" into mnc-dr-dev 2015-08-25 14:10:20 +00:00
Nicolas Prevot
d34ecae444 Don't set a null filter to a cross-profile ResolveInfo. 
ResolverActivity expects the filter not to be null.

BUG:23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
 2015-08-25 13:03:37 +01:00
Jorim Jaggi
2cb7004928 Scale notifications on lockscreen for 420 dpi devices 
Bug: 23299488
Change-Id: Ied4505532aad41a3a1469efce2464a491661fb6c
 2015-08-25 04:56:43 +00:00