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

274261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
3b2a713f92 Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am: 6623f4177c am: 38b71c5741 
am: 5eac2b0d88

Change-Id: I63b57594c6d2eb833a577ff8b51c01e9d2e31d39
 2016-07-18 15:22:05 +00:00
Dirk Dougherty
eb18e7db0d Merge \"Merge \\"Merge \\\"Doc change: updates for DP5 release notes.\\\" into nyc-dev am: e92ebf666e\\" into nyc-mr1-dev am: 838542a660\" into nyc-mr1-dev-plus-aosp 
am: 8ec41f0c99

Change-Id: I6df83ca4ee10227acdbc49970c54a84a390162ce
 2016-07-18 15:15:40 +00:00
Lorenzo Colitti
ef3ec0dd34 Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp 
am: 17450e41b3

Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
 2016-07-18 15:15:33 +00:00
Dirk Dougherty
7fec09d3be Merge \\\"Doc change: updates for DP5 release notes.\\\" into nyc-dev am: e92ebf666e am: edf16d6d4b 
am: 822f118c24

Change-Id: I4b331c7a23dd929603658112d319a3d3257d6645
 2016-07-18 15:15:23 +00:00
Scott Main
5eac2b0d88 Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c 
am: 38b71c5741

Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58
 2016-07-18 15:15:14 +00:00
Android Build Merger (Role)
8ec41f0c99 Merge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev am: 838542a660" into nyc-mr1-dev-plus-aosp 2016-07-18 15:09:45 +00:00
Android Build Merger (Role)
17450e41b3 Merge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am: b5239329b1" into nyc-mr1-dev-plus-aosp 2016-07-18 15:09:30 +00:00
Dirk Dougherty
713aedaea4 Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev 
am: 838542a660

Change-Id: Ic79c889b404ea1c576b8f50431e2774dc8b2de12
 2016-07-18 15:09:05 +00:00
Alan Viverette
38a9d72c08 Merge \\"Use \\"real\\" display size for computing available densities\\" into nyc-mr1-dev am: ad126d3b8b 
am: e236079acb

Change-Id: I3c2145349415dfda8f4e1ce6b997f36ff84eea86
 2016-07-18 15:09:00 +00:00
Lorenzo Colitti
5dd90b15fb Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev 
am: b5239329b1

Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82
 2016-07-18 15:08:54 +00:00
Dirk Dougherty
822f118c24 Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e 
am: edf16d6d4b

Change-Id: I46312fed717840506111bde4be9d6ae1dc239caa
 2016-07-18 15:08:30 +00:00
smain@google.com
38b71c5741 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev 
am: 6623f4177c

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
 2016-07-18 15:08:13 +00:00
Android Build Merger (Role)
838542a660 Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf666e" into nyc-mr1-dev 2016-07-18 15:03:03 +00:00
Dirk Dougherty
6abda3a4eb Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev 
am: e92ebf666e

Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48
 2016-07-18 15:02:29 +00:00
Dirk Dougherty
edf16d6d4b Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev 
am: e92ebf666e

Change-Id: I1396a1e544c31308bbe33ca525bace7640edbd3f
 2016-07-18 15:02:28 +00:00
Alan Viverette
e236079acb Merge \"Use \"real\" display size for computing available densities\" into nyc-mr1-dev 
am: ad126d3b8b

Change-Id: Ib4641e6577dbae1bbe5a4215dd2b1d947399a1c9
 2016-07-18 15:02:13 +00:00
TreeHugger Robot
b5239329b1 Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev 2016-07-18 15:00:21 +00:00
Scott Main
6623f4177c Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev 2016-07-18 14:57:38 +00:00
TreeHugger Robot
ad126d3b8b Merge "Use "real" display size for computing available densities" into nyc-mr1-dev 2016-07-18 14:53:56 +00:00
Dirk Dougherty
e92ebf666e Merge "Doc change: updates for DP5 release notes." into nyc-dev 2016-07-18 14:52:45 +00:00
Ricky Wai
939edb0dbc Merge \\"Do not allow to disable package \\"android\\"\\" into nyc-mr1-dev am: a5111bfda4 
am: e9e9f30085

Change-Id: I6159402639a440849357bd4ccd53bc4cb8fbab7a
 2016-07-18 14:36:56 +00:00
Ricky Wai
e9e9f30085 Merge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev 
am: a5111bfda4

Change-Id: Ia983198d1c41848d78ef18ed189d6f68cbc39350
 2016-07-18 14:29:51 +00:00
Ricky Wai
a5111bfda4 Merge "Do not allow to disable package "android"" into nyc-mr1-dev 2016-07-18 14:22:28 +00:00
Julia Reynolds
fef4777c18 Merge \"Merge \\\"Check uid for notification policy access.\\\" into nyc-dev am: 8f17d2a48b am: 5710e91931\" into nyc-mr1-dev-plus-aosp 
am: 1ae7b3e1be

Change-Id: I9bbe363815faeb55398a9914f81dc84eb49ce09e
 2016-07-18 13:40:06 +00:00
Julia Reynolds
de21e34536 Merge \\\"Check uid for notification policy access.\\\" into nyc-dev am: 8f17d2a48b am: 5921f81724 
am: 31ebd4ed30

Change-Id: I4abc8b2654daca9dd88a0e2a7acca63bc1d7484f
 2016-07-18 13:40:03 +00:00
Android Build Merger (Role)
1ae7b3e1be Merge "Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b am: 5710e91931" into nyc-mr1-dev-plus-aosp 2016-07-18 13:33:36 +00:00
Julia Reynolds
af22260f5d Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b 
am: 5710e91931

Change-Id: I1a4957ded3e3526df8b2bb36093b70cee3f8c065
 2016-07-18 13:33:04 +00:00
Julia Reynolds
31ebd4ed30 Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b 
am: 5921f81724

Change-Id: I48923935bf394c39441335423a24dd0b88b8b51e
 2016-07-18 13:32:57 +00:00
Ricky Wai
1a7b160ca5 Do not allow to disable package "android" 
Bug: 25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
 2016-07-18 14:29:53 +01:00
Julia Reynolds
5710e91931 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
 2016-07-18 13:25:54 +00:00
Julia Reynolds
5921f81724 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a
 2016-07-18 13:25:51 +00:00
Julia Reynolds
8f17d2a48b Merge "Check uid for notification policy access." into nyc-dev 2016-07-18 13:16:16 +00:00
Derek Sollenberger
163c97a8ea Merge changes from topic 'skia_merge' 
* changes:
  Fix include to match Skia filename change
  Remove references to SkImageDecoder (part 2)
  Update SkiaCanvasProxy with SkSurface API change
  Return DNG mimeType for the case kDNG_SkEncodedFormat
  Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/1737693006.
  skia SkDocument - new MakePDF API, fix leak
 2016-07-18 12:07:44 +00:00
Lorenzo Colitti
f4a45f4c33 Add an isListen method to NetworkRequests. 
This allows simplification of the ConnectivityService code.

Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
 2016-07-18 18:42:26 +09:00
Andrei Stingaceanu
4e750e822f Merge "Keyboard shortcuts: minor Activity broadcast refactor" 2016-07-18 09:39:52 +00:00
Dirk Dougherty
0f1dd617cb Doc change: updates for DP5 release notes. 
Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0
 2016-07-17 21:29:53 -07:00
Abodunrinwa Toki
cc59a84490 Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92 
am: c749762107

Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e
 2016-07-17 18:26:40 +00:00
Abodunrinwa Toki
c749762107 Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev 
am: 3b8e0fdf92

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
 2016-07-17 18:20:11 +00:00
Abodunrinwa Toki
3b8e0fdf92 Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev 2016-07-17 18:07:09 +00:00
Tim Murray
36030dda49 Merge \\"Make sure StrictMode allows disk reads when calling isThreadInProcess.\\" into nyc-mr1-dev am: afa67f3d34 
am: 62547293e3

Change-Id: Idc39bd967dfc45c9d66aaf5f28e1012c4c15bd78
 2016-07-16 19:29:44 +00:00
Tim Murray
62547293e3 Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev 
am: afa67f3d34

Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
 2016-07-16 19:25:37 +00:00
Tim Murray
afa67f3d34 Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev 2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6 Make sure StrictMode allows disk reads when calling isThreadInProcess. 
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
 2016-07-16 11:48:01 -07:00
Adam Lesinski
8024bf723c Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e 
am: 6a9f651b73

Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67
 2016-07-16 02:44:06 +00:00
Andreas Gampe
80c3459b3f Frameworks/base: Fix braino missing line am: 06eb24d95e 
am: 46d5eca989

Change-Id: I6cdcd67e7bed24819eac5e11fc775ef8f243a8e0
 2016-07-16 02:43:56 +00:00
Adam Lesinski
6a9f651b73 Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev 
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
 2016-07-16 02:38:24 +00:00
Andreas Gampe
46d5eca989 Frameworks/base: Fix braino missing line 
am: 06eb24d95e

Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
 2016-07-16 02:38:18 +00:00
TreeHugger Robot
c3829f528e Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev 2016-07-16 02:33:55 +00:00
Robert Shih
6f5be322d2 MediaRecorder: fix OnInfo related documentation 
The original documentation said MediaRecorder.OnInfoListener was called for
error cases.

Bug: 25424209
Change-Id: Ic8d2dee67b15a64604a959e7e6964436da92d6ba
 2016-07-15 18:39:42 -07:00
Andreas Gampe
06eb24d95e Frameworks/base: Fix braino missing line 
This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
 2016-07-15 18:13:48 -07:00