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

199288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
0cd143adae Merge "AAPT: Fix regression in resource versioning" into mnc-dev 2015-08-14 20:46:49 +00:00
Quddus Chong
b8fb239ac5 Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 2015-08-14 20:44:54 +00:00
Andrew Solovay
a2eebe858a cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. 
Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

Added section describing the new support library methods. Also
updating lists of normal and dangerous permissions based on current
AndroidManifest in mnc-dev, as well as any other changes brought to my
attention.

See first comment for doc stage location.

Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-14 13:44:14 -07:00
Adam Lesinski
beb9e33bfb AAPT: Fix regression in resource versioning 
With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
 2015-08-14 13:41:46 -07:00
Daniel Sandler
9f238a9455 Merge "Introducing M Land." into mnc-dev 2015-08-14 19:59:48 +00:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Dan Sandler
8df3cfe6b8 Introducing M Land. 
The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
 2015-08-14 15:51:13 -04: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
Chris Wren
c510ad56a8 instrument fingerprint service 
auth and enroll actions
  dumpsys for enrollment statistics

Bug: 22951001
Change-Id: Id472789756df110fb8b02f542440c8112e0d2a44
 2015-08-14 15:43:15 -04:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing." 
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
 2015-08-14 15:25:55 -04:00
Julia Reynolds
ac5f962898 am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.
 2015-08-14 19:22:04 +00:00
Julia Reynolds
7df411d0cc Merge "Clear calling identity before getting the current user." into mnc-dev 2015-08-14 19:17:31 +00:00
Jorim Jaggi
50ff3afb01 Start pulse fading exactly when screen is turned on 
Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
 2015-08-14 18:47:59 +00:00
Jean-Michel Trivi
2152edeb30 am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:33:08 +00:00
Jean-Michel Trivi
16fa58cb13 Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 2015-08-14 18:19:17 +00:00
Andrew Solovay
44053b4ed3 am e7489fde: docs: Updating the permissions docs for Preview 3. 
* commit 'e7489fde9ff1529cc0c7a984046918a47b97b40c':
  docs: Updating the permissions docs for Preview 3.
 2015-08-14 17:29:03 +00:00
Eric Gilmore
398d655f3e am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs 
* commit 'd381eb9587717c64aa34471e1e87b5cd65d43292':
  Adding link to location API video.
 2015-08-14 17:28:54 +00:00
Rich Sloager
08b3f12146 am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs 
* commit '72c1f222a172ef314d7fadb715c327ce781c2751':
  docs: studio 1.3.1 revision updates
 2015-08-14 17:28:49 +00:00
Rich Sloager
285c9cb7bf am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs 
* commit '4f66c1da04e2b6266f9ab652c757aa7f00e78c08':
  docs: studio 1.3.1 download updates
 2015-08-14 17:28:45 +00:00
Cheryl Potter
a2f11f8145 am caec50ec: docs: changed version 5 to 3 for Billing API 
* commit 'caec50ec4916adb3f8aa4ab579e29d6b6308f17d':
  docs: changed version 5 to 3 for Billing API
 2015-08-14 17:28:38 +00:00
Quddus Chong
98d2d0d54c am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initiated action to select the app or app media. bugs: 22932742 
* commit '862f0f030ea229ad226253759b6b758f4f89ddf5':
  doc: Updated Auto quality guideline for media playback (AU-MT).      The update reflects new guidance that media apps do      not autoplay on startup of Android Auto or without      user initiated action to select the app or app media. bugs: 22932742
 2015-08-14 17:28:27 +00:00
Rich Sloager
55ee752ed5 am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs 
* commit 'c5b580116944320b47bbda5d302a5ed2e7a06088':
  docs: gradle plugin revision update
 2015-08-14 17:28:04 +00:00
Joe Fernandez
9186895b76 am 5fd0eff1: docs: August 2015 Android Dashboard update 
* commit '5fd0eff1996ec5a3558dddb6dfa9f3467e28cd69':
  docs: August 2015 Android Dashboard update
 2015-08-14 17:27:57 +00:00
Rich Sloager
998f550139 am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs 
* commit '378a3a8932cfc1140962bcb36a1dd057218c9e4d':
  docs: studio 1.3 annotation-update
 2015-08-14 17:27:51 +00:00
Rich Slogar
3ee9532754 am 6c00399c: docs: studio 1.3 private resources 
* commit '6c00399c89bf4953ef36872e6fa237afff7a6491':
  docs: studio 1.3 private resources
 2015-08-14 17:27:43 +00:00
Rich Slogar
8f0d545130 am e5fe2468: docs: studio 1.3 allocation tracker 
* commit 'e5fe2468e4673c086aab463bb281a8fa09b353ed':
  docs: studio 1.3 allocation tracker
 2015-08-14 17:27:37 +00:00
Rich Slogar
860e65be5c am 16c5726e: docs: studio 1.3 developer services 
* commit '16c5726e7c237f27e135a5a5dfcd484bc28e0bef':
  docs: studio 1.3 developer services
 2015-08-14 17:27:33 +00:00
Rich Sloager
e62df60aea am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs 
* commit 'b90583acc7dcf83fa7755b5aaef36f08e8e7d5b9':
  docs: create-project-link in studio overview
 2015-08-14 17:27:28 +00:00
Rich Sloager
ccd0fe27ef am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs 
* commit 'c87ca50a623e0ae7712708f5be50977dc8652568':
  docs: studio 1.3 downloads
 2015-08-14 17:27:24 +00:00
Rich Sloager
fd8da61afd am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs 
* commit 'f0cd0441cebf2bdbaa0ec304cb5dd959b7702b4c':
  docs: studio 1.3 manifest merger update
 2015-08-14 17:27:15 +00:00
Rich Sloager
371ccd1343 am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs 
* commit '51c02f6a10bb2653d7f5961807a2870fb5dd3a47':
  docs: studio 1.3 revisions - android plugin for gradle
 2015-08-14 17:27:11 +00:00
Rich Sloager
f82f33d3ae am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs 
* commit '4c5b6cc42e4b61a4176007a04906ad4a19d0623b':
  docs: studio 1.3 live templates
 2015-08-14 17:27:07 +00:00
Rich Sloager
5f8d372848 am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs 
* commit 'b8987585ea1f677d61073d63a7b33e6d9cd75ebb':
  docs: studio 1.3 revisions - studio
 2015-08-14 17:27:02 +00:00
Rich Sloager
c4fe8db79b am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs 
* commit '322de02a10edadde014b9c31365c9f43dcbd60df':
  docs: studio 1.3 hprof viewer
 2015-08-14 17:26:58 +00:00
Rich Sloager
27b246028a am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs 
* commit '47c88fca7df16077acd2902a29d26dd5e2b513c4':
  docs: studio 1.3 separate test folder
 2015-08-14 17:26:51 +00:00
Rich Sloager
71178f0240 am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs 
* commit '29dfe902de22655770f1bc001aa451b74a3195a3':
  docs: studio 1.3 fingerprint support
 2015-08-14 17:26:46 +00:00
Rich Sloager
57cdc0116f am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs 
* commit '054711b6041fb352e5716e307341bf35858a1546':
  docs: studio 1.3 sdk manager updates
 2015-08-14 17:26:42 +00:00
Rich Slogar
7a76e44db9 am 1f6a5f89: docs: design support library 22.2.1 revisions 
* commit '1f6a5f89a55a6825c68693f8ffa15426a5f123d3':
  docs: design support library 22.2.1 revisions
 2015-08-14 17:26:37 +00:00
Andrew Solovay
8a9972ccac am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs 
* commit '803c573871932a0f2a5e2fde22b49e78e2829069':
  docs: Updated the list of auto partners, added links
 2015-08-14 17:26:29 +00:00
Quddus Chong
9b8e179d5e docs: Updated API Overview and Behavior Changes docs for M Preview 3. 
Change-Id: Ibff73ca9321ba1b117c361402d8045d9558c5c2f
 2015-08-14 10:22:09 -07:00
Joe Fernandez
3eb636b614 docs: Build Tools 23.0.0 release notes 
Release notes to coincide with the M Preview 3 and API 23 release

Change-Id: I4550500f1dccc367b80463665d394a73ea102db3
 2015-08-14 10:18:13 -07: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
Dianne Hackborn
9e398eb514 am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
  Fix issue #22940169: "pm grant" can no longer grant permissions...
 2015-08-14 17:15:33 +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
Dianne Hackborn
81f3a85aa2 Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 2015-08-14 17:06:20 +00: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
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