Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,757 Commits 3 Branches 0 Tags
b7768918014d34c2e4d74abefeb03956aee421fc
Commit Graph

198757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sreeram Ramachandran
b776891801 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 
am: 33c1718205

* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:40:35 +00:00
Sreeram Ramachandran
33c1718205 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 
am: d3b6e2d790

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd 
am: 42faa221d7

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:10:19 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 2015-11-19 15:59:42 +00:00
Sreeram Ramachandran
f1f45fe012 Don't use framework permission strings for netd permissions. 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839)
 2015-11-18 17:04:18 +00:00
Michael Wright
18a2ac0506 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 
am: bd23716585  -s ours

* commit 'bd23716585bd21b4dc4bf87bd56ce588c8d457df':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:24:16 +00:00
Michael Wright
bd23716585 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de 
am: 614ea46405

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:06:27 +00:00
Michael Wright
614ea46405 DO NOT MERGE. Prevent recents from coming up when in SUW 
am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:52:13 +00:00
Michael Wright
4aa1e48a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 2015-11-17 18:33:38 +00:00
Sanket Padawe
abea6dc466 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev 2015-11-17 01:07:28 +00:00
Eino-Ville Talvala
0b6e1bfae8 Camera: Minor documentation update 
- Further clarify hardware.camera feature being only for the back camera

Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
 2015-11-13 15:25:45 -08:00
Michael Wright
333db2e122 DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
 2015-11-13 21:53:14 +00:00
Michael Wright
84669ca8de DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
 2015-11-13 21:52:18 +00:00
Winson Chung
d45a18c8ec Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 
am: 32265b9ea0  -s ours

* commit '32265b9ea000b04ac62f3c114edb063246260401':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:55 +00:00
Winson Chung
32265b9ea0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 
am: b133b984a0

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:30 +00:00
Winson Chung
b133b984a0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 
am: bb4da4efc3

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:38 +00:00
Winson Chung
dce0f8040d Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 2015-11-13 18:02:47 +00:00
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Shreyas Basarge
c9eb8b4367 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d 
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:29:47 +00:00
Shreyas Basarge
64bdb9f06b Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e 
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:40 +00:00
Shreyas Basarge
359ee7f47d Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:24 +00:00
Shreyas Basarge
bf29f10c1e Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af 
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:36 +00:00
Matthew Williams
af5c9f809c Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:35 +00:00
Shreyas Basarge
44368e6dd4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f 
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:34 +00:00
Matthew Williams
6d13650c74 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece 
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705 
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:02 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE 
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Sanket Padawe
ccbe7383e6 Don't allow contact sharing by default for device not recognized as carkit. 
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit 07533dbfff)
 2015-11-12 23:53:42 +00:00
Shreyas Basarge
2f137b7705 Sync extras bundle comparison can throw NPE 
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
 2015-11-12 15:32:44 +00:00
Eino-Ville Talvala
d8407271ff Camera: Documentation updates 
- Clarify hardware.camera feature being only for the back camera
 - Clarify what setting a CaptureRequest field to null does
 - Use preCorrectionActiveArray instead of activeArray in list of
   possible raw output sizes
 - Clarify length of GPS processing field for camera1 API

Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
 2015-11-11 23:59:38 +00:00
Winson
a7df77155d DO NOT MERGE Ensure that the device is provisioned before showing Recents. 
Bug: 25476219

Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
 2015-11-11 17:48:34 +00:00
Winson
16a76dadcc DO NOT MERGE Ensure that the device is provisioned before showing Recents. 
Bug: 25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
 2015-11-11 17:47:55 +00:00
Matthew Williams
c0f39c1ece Sync extras bundle comparison can throw NPE 
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
 2015-11-11 14:34:04 +00:00
Dan Sandler
e68e70d509 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b 
am: 7e16b2e8f5  -s ours

* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:33:48 +00:00
Dan Sandler
7e16b2e8f5 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b 
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:49 +00:00
Dan Sandler
ab4857790b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e 
am: 6c3186ea07  -s ours

* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:17 +00:00
Dan Sandler
511357c39b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours 
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:54 +00:00
Dan Sandler
6026b5b17e Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:50 +00:00
Dan Sandler
b1de85487a Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:22 +00:00
Dan Sandler
1044e162c3 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf771)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
 2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf771)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
 2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf771)
 2015-10-23 01:37:52 +00:00
Dianne Hackborn
e34445f11a Merge "Docs only change: update build version docs." into mnc-dev 2015-10-15 00:56:05 +00:00