Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,029 Commits 3 Branches 0 Tags
740b9397fbeea1722afc5a66215ef8fac2bd6bc4
Commit Graph

52045 Commits

Author SHA1 Message Date
Ruben Brunk
cbb6c16fe6 am 6f4f94ae: am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '6f4f94ae60129be8052ae3b1c4fd9b83a4729073':
  Add experimental camera session prepare API.
 2015-08-17 18:01:20 +00:00
Ruben Brunk
6f4f94ae60 am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '305680d6a08f6b44d71d7c83aebc557cfcbd3f85':
  Add experimental camera session prepare API.
 2015-08-17 17:51:42 +00:00
Ruben Brunk
3723af531a am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
  Add experimental camera session prepare API.
 2015-08-17 17:37:16 +00:00
Ruben Brunk
c57f309a1b Merge "Add experimental camera session prepare API." into mnc-dr-dev 2015-08-17 17:28:12 +00:00
Derek Sollenberger
deead00082 Merge "Add ninePatch support to Canvas.h" 2015-08-17 17:20:55 +00:00
Esteban Talavera
019a499c70 am 12e42ba2: am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '12e42ba225cf6c38eaf752f55a22ce6296d2343c':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 16:26:39 +00:00
Esteban Talavera
12e42ba225 am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '31638de30564d5b5fdc4177227cdab6df681ecfc':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:14:04 +00:00
Esteban Talavera
07b36bd3bf am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit 'aed1c9fbc5c4f77bfc8c44fb7bd87bbdb6dc0174':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:00:04 +00:00
Esteban Talavera
aed1c9fbc5 am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '5d467ac54ab0390d6b911628d56294bb4277d2f1':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 14:53:53 +00:00
Esteban Talavera
5d467ac54a Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 2015-08-17 14:47:49 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 03:03:29 +00:00
Dianne Hackborn
83eb8493b2 am 0ce3a291: am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '0ce3a291fb4fdbfd041e605c0cb71dff4f681e8a':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 03:02:55 +00:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Dianne Hackborn
0ce3a291fb am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '914eda0070cde26325db3d2a2e9bbf0a9e612107':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:55:05 +00:00
Eino-Ville Talvala
33689420d1 am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:37:19 +00:00
Dianne Hackborn
574f9b42da am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit 'ac11522e540422d3afc691af5510da14ab7a3d40':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:36:58 +00:00
Eino-Ville Talvala
eec25a4ffe am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 01:34:42 +00:00
Dianne Hackborn
ac11522e54 am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 01:34:04 +00:00
Eino-Ville Talvala
1017f9862f Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 2015-08-15 00:46:15 +00:00
Ruben Brunk
7ed1aaa369 Add experimental camera session prepare API. 
Bug: 18949148
Change-Id: I35fde35436ae5bebab3c912243e621285307c211
 2015-08-14 16:47:51 -07:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07:00
Adam Lesinski
e789fc02ae am c852a3e3: am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'c852a3e39c1bbb112e2705edc6714b6b687cb55d':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 21:28:51 +00:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo... 
...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
 2015-08-14 14:08:43 -07:00
Adam Lesinski
c852a3e39c am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'eb694bb6e69dd382e9ed114dde604c6a0942c3c2':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 20:12:44 +00:00
Adam Lesinski
546909c990 am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:56:38 +00:00
Adam Lesinski
479c482ca1 am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:47:54 +00:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Derek Sollenberger
edca320a2b Add ninePatch support to Canvas.h 
Change-Id: Ib3202fd7c5b9f35853f286abe84b3ed009df1a81
 2015-08-14 14:59:37 -04:00
Alan Viverette
74fbf8795c Merge "Add accessors for TabWidget strip drawables" 2015-08-14 17:58:43 +00:00
Alan Viverette
d78036bbec Add accessors for TabWidget strip drawables 
Change-Id: Ia6aef6a2221096c2653ae39fcec60289fa0ee2fb
 2015-08-14 13:53:56 -04:00
Chris Tate
848dd4bfc9 am 14e12258: am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '14e122582c45e236bf2e4c59d10438816f2eed09':
  Make "Ask every time" actually work that way
 2015-08-14 17:44:39 +00:00
Chris Tate
14e122582c am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '13845aeae3fc3044f3fc279ca421df6d4f78ee35':
  Make "Ask every time" actually work that way
 2015-08-14 17:35:28 +00:00
Chris Tate
b2d4c5507f am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit 'b47890c4e7a7fc119e74da2b50bf94c2cf172916':
  Make "Ask every time" actually work that way
 2015-08-14 17:21:52 +00:00
Chris Tate
b47890c4e7 am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way
 2015-08-14 17:15:37 +00:00
Chris Tate
7e7d79ef2f Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:30 +00:00
Alan Viverette
6bfab4e49f Merge "Clean up TabWidget" 2015-08-14 16:15:10 +00:00
Svetoslav Ganov
99ba7ad73c am f6401419: am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'f64014195b6d7bdc2f4d79f3c4c71de16d2fe338':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:44:14 +00:00
Svetoslav Ganov
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +00:00
Alan Viverette
7eb09d15cc Clean up TabWidget 
No functional changes, just refactoring and cleaning up comments.

Actually, just one functional change so that setting the tab strip to
@empty will actually remove the tab strip drawable. This makes it
consistent with passing null to the accessor method.

Change-Id: I6f5ba8bea4e8b30117de5f12a86957e995812cfe
 2015-08-14 11:36:01 -04:00
Zoltan Szatmary-Ban
887cffea24 Remove uids with empty history from NetworkStats uid enumeration 
Bug: 23018174
Change-Id: I1a482280599e0f5da18a208e727653d4bd4107ec
 2015-08-14 16:21:52 +01:00
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193 am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:13:38 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Adam Lesinski
621e06a64d Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs 
System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
 2015-08-13 22:06:31 -07:00
Jeff Sharkey
c2f61b7798 am e7ed65eb: am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'e7ed65eb45902123463e7100c261062752587bfd':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:29:06 +00:00
Wei Liu
06db906b1d am b8a1747b: am ddd3e323: am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev 
* commit 'b8a1747b6dd3936bc10834f4c3aa1674bfe1bfb6':
  Add a setting to enable cellular on boot.
 2015-08-14 03:28:46 +00:00
Jeff Sharkey
e7ed65eb45 am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit '4efd3f26ac515f85adde2979ec1d8d68218fc470':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:19:00 +00:00
Wei Liu
b8a1747b6d am ddd3e323: am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev 
* commit 'ddd3e323c4cefb8994dd5f2927ea9c11dbc5cfd2':
  Add a setting to enable cellular on boot.
 2015-08-14 03:18:22 +00:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way 
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
 2015-08-13 18:56:05 -07:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:35:40 +00:00